Merge branch 'develop'

bumped to version 6.14.1
[minor] [fix] add child in sales browser
2015-12-23 16:29:34 +05:30 · 2015-12-23 16:59:34 +06:00 · 2015-12-23 16:23:37 +05:30 · 2015-12-23 16:09:29 +05:30 · 2015-12-23 13:03:31 +05:30 · 2015-12-23 13:01:30 +05:30
141 changed files with 8372 additions and 3383 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.13.1'
+__version__ = '6.14.1'
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -25,6 +25,7 @@
   "oldfieldtype": "Section Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -46,6 +47,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -71,6 +73,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -95,6 +98,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -120,6 +124,7 @@
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -143,6 +148,7 @@
   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -166,6 +172,7 @@
   "options": "\nBalance Sheet\nProfit and Loss", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -191,6 +198,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -212,6 +220,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -238,6 +247,7 @@
   "options": "Account", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -261,9 +271,10 @@
   "no_copy": 0, 
   "oldfieldname": "account_type", 
   "oldfieldtype": "Select", 
-   "options": "\nBank\nCash\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": "\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", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -289,6 +300,7 @@
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -315,6 +327,7 @@
   "options": "No\nYes", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -338,6 +351,7 @@
   "options": "Warehouse", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -361,6 +375,7 @@
   "options": "\nDebit\nCredit", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -383,6 +398,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -405,6 +421,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -427,6 +444,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -445,7 +463,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:41.535663", 
+ "modified": "2015-12-12 10:19:54.365839", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Account", 
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -199,6 +199,10 @@ class Account(Document):

 			if val != [self.is_group, self.root_type, self.company]:
 				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+				
+			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+				frappe.db.set_value("Account", new, "parent_account", 
+					frappe.db.get_value("Account", old, "parent_account"))

 		return new_account

--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -347,6 +347,7 @@ frappe.ui.form.on("Journal Entry Account", {
 				callback: function(r) {
 					if(r.message) {
 						$.extend(d, r.message);
+						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, dt, dn);
 						refresh_field('accounts');
 					}
 				}
@@ -355,11 +356,11 @@ frappe.ui.form.on("Journal Entry Account", {
 	},

 	debit_in_account_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
+		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},

 	credit_in_account_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
+		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},

 	debit: function(frm, dt, dn) {
@@ -368,6 +369,17 @@ frappe.ui.form.on("Journal Entry Account", {

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

@@ -395,8 +407,6 @@ $.extend(erpnext.journal_entry, {
 	},

 	set_debit_credit_in_company_currency: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
-
 		var row = locals[cdt][cdn];

 		frappe.model.set_value(cdt, cdn, "debit",
@@ -413,7 +423,8 @@ $.extend(erpnext.journal_entry, {
 		var row = locals[cdt][cdn];

 		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
-			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
+			row.exchange_rate = 1;
+			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		} else if (!row.exchange_rate || row.exchange_rate == 1 || row.account_type == "Bank") {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
@@ -429,11 +440,15 @@ $.extend(erpnext.journal_entry, {
 				},
 				callback: function(r) {
 					if(r.message) {
-						frappe.model.set_value(cdt, cdn, "exchange_rate", r.message);
+						row.exchange_rate = r.message;
+						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 					}
 				}
 			})
+		} else {
+			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		}
+		refresh_field("exchange_rate", cdn, "accounts");
 	},

 	quick_entry: function(frm) {
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -104,6 +104,12 @@ class JournalEntry(AccountsController):
 						msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account))
 					elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes":
 						frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))
+						
+				if d.is_advance == "Yes":
+					if d.party_type == 'Customer' and flt(d.debit) > 0:
+						frappe.throw(_("Row {0}: Advance against Customer must be credit").format(d.idx))
+					elif d.party_type == 'Supplier' and flt(d.credit) > 0:
+						frappe.throw(_("Row {0}: Advance against Supplier must be debit").format(d.idx))

 	def validate_against_jv(self):
 		for d in self.get('accounts'):
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1153,6 +1153,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1176,6 +1201,30 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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, 
@@ -1201,31 +1250,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -2463,7 +2487,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2015-12-01 00:49:02.736868", 
+ "modified": "2015-12-17 16:18:58.177334", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Purchase Invoice", 
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
--- a/erpnext/accounts/report/cash_flow/init.py
+++ b/erpnext/accounts/report/cash_flow/init.py
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -0,0 +1,6 @@
+// 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.query_reports["Cash Flow"] = erpnext.financial_statements;
--- a/erpnext/accounts/report/cash_flow/cash_flow.json
+++ b/erpnext/accounts/report/cash_flow/cash_flow.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2015-12-12 10:22:45.383203", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2015-12-12 10:22:45.383203", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow", 
+ "owner": "Administrator", 
+ "ref_doctype": "GL Entry", 
+ "report_name": "Cash Flow", 
+ "report_type": "Script Report"
+}
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -0,0 +1,134 @@
+# 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 erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
+from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import get_net_profit_loss
+
+
+def execute(filters=None):
+	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+
+	operation_accounts = {
+		"section_name": "Operations",
+		"section_footer": _("Net Cash from Operations"),
+		"section_header": _("Cash Flow from Operations"),
+		"account_types": [
+			{"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")}
+		]
+	}
+
+	investing_accounts = {
+		"section_name": "Investing",
+		"section_footer": _("Net Cash from Investing"),
+		"section_header": _("Cash Flow from Investing"),
+		"account_types": [
+			{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")}
+		]
+	}
+
+	financing_accounts = {
+		"section_name": "Financing",
+		"section_footer": _("Net Cash from Financing"),
+		"section_header": _("Cash Flow from Financing"),
+		"account_types": [
+			{"account_type": "Equity", "label": _("Net Change in Equity")}
+		]
+	}
+
+	# combine all cash flow accounts for iteration
+	cash_flow_accounts = []
+	cash_flow_accounts.append(operation_accounts)
+	cash_flow_accounts.append(investing_accounts)
+	cash_flow_accounts.append(financing_accounts)
+
+	# compute net profit / loss
+	income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
+	net_profit_loss = get_net_profit_loss(income, expense, period_list)
+
+	data = []
+
+	for cash_flow_account in cash_flow_accounts:
+
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'], 
+			"parent_account": None,
+			"indent": 0.0, 
+			"account": cash_flow_account['section_header']
+		})
+
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": operation_accounts['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
+
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(filters.company, account['account_type'], period_list)
+			account_data.update({
+				"account_name": account['label'], 
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header']
+			})
+			data.append(account_data)
+			section_data.append(account_data)
+
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'], period_list)
+
+	add_total_row_account(data, data, _("Net Change in Cash"), period_list)
+	columns = get_columns(period_list)
+
+	return columns, data
+
+
+def get_account_type_based_data(company, account_type, period_list):
+	data = {}
+	for period in period_list:
+		gl_sum = frappe.db.sql_list("""
+			select sum(credit) - sum(debit)
+			from `tabGL Entry`
+			where company=%s and posting_date >= %s and posting_date <= %s 
+				and voucher_type != 'Period Closing Voucher'
+				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
+		""", (company, period['from_date'], period['to_date'], account_type))
+		
+		if gl_sum and gl_sum[0]:
+			amount = gl_sum[0]
+			if account_type == "Depreciation":
+				amount *= -1
+		else:
+			amount = 0
+		
+		data.update({
+			"from_date": period['from_date'], 
+			"to_date": period['to_date'], 
+			period["key"]: amount
+		})
+	return data
+
+
+def add_total_row_account(out, data, label, period_list):
+	total_row = {
+		"account_name": "'" + _("{0}").format(label) + "'",
+		"account": None
+	}
+
+	for row in data:
+		if row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+	out.append(total_row)
+	out.append({})
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -257,4 +257,4 @@ def get_columns(period_list):
 			"width": 150
 		})

-	return columns
+	return columns
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -59,7 +59,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 		this.frm.toggle_display("supplier_name",
 			(this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));

-		if(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request") {
+		if(this.frm.docstatus==0 &&
+			(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
 			this.set_from_product_bundle();
 		}

--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1349,6 +1349,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1372,6 +1397,30 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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, 
@@ -1397,31 +1446,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -2434,7 +2458,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-12-01 00:48:11.749313", 
+ "modified": "2015-12-17 16:18:39.096762", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order", 
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1080,6 +1080,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1103,6 +1128,30 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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, 
@@ -1128,31 +1177,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1690,7 +1714,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2015-12-01 00:48:50.969833", 
+ "modified": "2015-12-17 16:18:29.855942", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier Quotation", 
--- a/erpnext/change_log/v6/v6_14_0.md
+++ b/erpnext/change_log/v6/v6_14_0.md
@@ -0,0 +1,7 @@
+- **Cash Flow Report**
+	- Thank you [Chris Ian Fiel](https://discuss.erpnext.com/users/ccfiel/activity) for this much needed report!
+	- You can access this report from *Accounts > Main Reports > Cash Flow*
+- **Additional Discount Percentage**
+	- Enter a percentage value to calculate Additional Discount Amount
+	- Apply such a discount in the POS screen
+	- Available in all Selling and Buying transactions
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -229,6 +229,12 @@ def get_data():
 					"doctype": "GL Entry",
 					"is_query_report": True
 				},
+				{
+					"type": "report",
+					"name": "Cash Flow",
+					"doctype": "GL Entry",
+					"is_query_report": True
+				},
 				{
 					"type": "report",
 					"name": "Profit and Loss Statement",
--- a/erpnext/config/learn.py
+++ b/erpnext/config/learn.py
@@ -21,6 +21,11 @@ def get_data():
 					"label": _("Customizing Forms"),
 					"youtube_id": "pJhL9mmxV_U"
 				},
+				{
+					"type": "help",
+					"label": _("Report Builder"),
+					"youtube_id": "y0o5iYZOioU"
+				},
 			]

 		},
@@ -57,6 +62,16 @@ def get_data():
 					"label": _("Workflow"),
 					"youtube_id": "yObJUg9FxFs"
 				},
+				{
+					"type": "help",
+					"label": _("Email Account"),
+					"youtube_id": "YFYe0DrB95o"
+				},
+				{
+					"type": "help",
+					"label": _("File Manager"),
+					"youtube_id": "4-osLW3E_Rk"
+				},
 			]
 		},
 		{
@@ -76,7 +91,12 @@ def get_data():
 					"type": "help",
 					"label": _("Opening Accounting Balance"),
 					"youtube_id": "kdgM20Q-q68"
-				}
+				},
+				{
+					"type": "help",
+					"label": _("Advance Payments"),
+					"youtube_id": "J46-6qtyZ9U"
+				},
 			]
 		},
 		{
@@ -111,7 +131,17 @@ def get_data():
 					"type": "help",
 					"label": _("Point-of-Sale"),
 					"youtube_id": "4WkelWkbP_c"
-				}
+				},
+				{
+					"type": "help",
+					"label": _("Product Bundle"),
+					"youtube_id": "yk-7kPrRyRRc"
+				},
+				{
+					"type": "help",
+					"label": _("Drop Ship"),
+					"youtube_id": "hUc0hu_XLdo"
+				},
 			]
 		},
 		{
@@ -152,6 +182,11 @@ def get_data():
 					"label": _("Managing Subcontracting"),
 					"youtube_id": "ThiMCC2DtKo"
 				},
+				{
+					"type": "help",
+					"label": _("Quality Inspection"),
+					"youtube_id": "WmtcF3Y40Fs"
+				},
 			]
 		},
 		{
@@ -235,4 +270,19 @@ def get_data():
 				},
 			]
 		},
+		{
+			"label": _("Website"),
+			"items": [
+				{
+					"type": "help",
+					"label": _("Publish Items on Website"),
+					"youtube_id": "W31LBBNzbgc"
+				},
+				{
+					"type": "help",
+					"label": _("Shopping Cart"),
+					"youtube_id": "xkrYO-KFukM"
+				},
+			]
+		},
 	]
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import json
 import frappe
-from frappe import _
+from frappe import _, scrub
 from frappe.utils import cint, flt, rounded
 from erpnext.setup.utils import get_company_currency
 from erpnext.controllers.accounts_controller import validate_conversion_rate, \
@@ -20,6 +20,7 @@ class calculate_taxes_and_totals(object):
 		self._calculate()

 		if self.doc.meta.get_field("discount_amount"):
+			self.set_discount_amount()
 			self.apply_discount_amount()

 		if self.doc.doctype in ["Sales Invoice", "Purchase Invoice"]:
@@ -325,6 +326,11 @@ class calculate_taxes_and_totals(object):
 	def _cleanup(self):
 		for tax in self.doc.get("taxes"):
 			tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail, separators=(',', ':'))
+			
+	def set_discount_amount(self):
+		if not self.doc.discount_amount and self.doc.additional_discount_percentage:
+			self.doc.discount_amount = flt(flt(self.doc.get(scrub(self.doc.apply_discount_on))) 
+				* self.doc.additional_discount_percentage / 100, self.doc.precision("discount_amount"))

 	def apply_discount_amount(self):
 		if self.doc.discount_amount:
--- a/erpnext/docs/assets/img/articles/$SGrab_428.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_428.png
--- a/erpnext/docs/assets/img/articles/$SGrab_429.png
+++ b/erpnext/docs/assets/img/articles/$SGrab_429.png
--- a/erpnext/docs/assets/img/articles/SGrab_250.png
+++ b/erpnext/docs/assets/img/articles/SGrab_250.png
--- a/erpnext/docs/assets/img/articles/SGrab_342.png
+++ b/erpnext/docs/assets/img/articles/SGrab_342.png
--- a/erpnext/docs/assets/img/articles/SGrab_343.png
+++ b/erpnext/docs/assets/img/articles/SGrab_343.png
--- a/erpnext/docs/assets/img/articles/SGrab_344.png
+++ b/erpnext/docs/assets/img/articles/SGrab_344.png
--- a/erpnext/docs/assets/img/articles/Screen
+++ b/erpnext/docs/assets/img/articles/Screen
--- a/erpnext/docs/assets/img/articles/Selection_014dd1559.png
+++ b/erpnext/docs/assets/img/articles/Selection_014dd1559.png
--- a/erpnext/docs/assets/img/articles/change-language-1.png
+++ b/erpnext/docs/assets/img/articles/change-language-1.png
--- a/erpnext/docs/assets/img/articles/change-language-2.png
+++ b/erpnext/docs/assets/img/articles/change-language-2.png
--- a/erpnext/docs/assets/img/articles/change-language-3.png
+++ b/erpnext/docs/assets/img/articles/change-language-3.png
--- a/erpnext/docs/assets/img/articles/change-password-1.png
+++ b/erpnext/docs/assets/img/articles/change-password-1.png
--- a/erpnext/docs/assets/img/articles/change-password-2.png
+++ b/erpnext/docs/assets/img/articles/change-password-2.png
--- a/erpnext/docs/assets/img/articles/edit-submitted-doc-1.png
+++ b/erpnext/docs/assets/img/articles/edit-submitted-doc-1.png
--- a/erpnext/docs/assets/img/articles/edit-submitted-doc-2.png
+++ b/erpnext/docs/assets/img/articles/edit-submitted-doc-2.png
--- a/erpnext/docs/assets/img/articles/edit-submitted-doc-3.png
+++ b/erpnext/docs/assets/img/articles/edit-submitted-doc-3.png
--- a/erpnext/docs/assets/img/articles/new-company-1.png
+++ b/erpnext/docs/assets/img/articles/new-company-1.png
--- a/erpnext/docs/assets/img/articles/new-company-2.png
+++ b/erpnext/docs/assets/img/articles/new-company-2.png
--- a/erpnext/docs/assets/img/articles/new-company-3.png
+++ b/erpnext/docs/assets/img/articles/new-company-3.png
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
@@ -335,6 +335,20 @@ from tax inclusive amount</p>
        
    
    
+	<p class="docs-attr-name">
+        <a name="set_discount_amount" href="#set_discount_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_discount_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
 	<p class="docs-attr-name">
        <a name="set_item_wise_tax" href="#set_item_wise_tax" class="text-muted small">
            <i class="icon-link small" style="color: #ccc;"></i></a>
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.12.11</code>
+			<code>6.14.0</code>
 		</td>
 	</tr>
 </table>
--- a/erpnext/docs/current/models/accounts/account.html
+++ b/erpnext/docs/current/models/accounts/account.html
@@ -210,6 +210,7 @@ Profit and Loss</pre>
                <pre>
 Bank
 Cash
+Depreciation
 Tax
 Chargeable
 Warehouse
@@ -945,10 +946,6 @@ Credit</pre>
 			
        
 			
-        
-			
-        
-			
            <li>


--- a/erpnext/docs/current/models/accounts/purchase_invoice.html
+++ b/erpnext/docs/current/models/accounts/purchase_invoice.html
@@ -717,32 +717,6 @@ Net Total</pre>
        
        <tr >
            <td>47</td>
-            <td ><code>column_break_46</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -755,8 +729,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>50</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
            <td ><code>section_break_49</code></td>
            <td >
                Section Break</td>
@@ -768,7 +780,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>51</td>
+            <td>52</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -782,7 +794,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>52</td>
+            <td>53</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -794,7 +806,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>53</td>
+            <td>54</td>
            <td ><code>column_break8</code></td>
            <td class="info">
                Column Break</td>
@@ -806,7 +818,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>54</td>
+            <td>55</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -820,7 +832,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>55</td>
+            <td>56</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -832,7 +844,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>56</td>
+            <td>57</td>
            <td ><code>total_advance</code></td>
            <td >
                Currency</td>
@@ -846,7 +858,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>57</td>
+            <td>58</td>
            <td ><code>outstanding_amount</code></td>
            <td >
                Currency</td>
@@ -860,7 +872,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>58</td>
+            <td>59</td>
            <td ><code>write_off</code></td>
            <td >
                Section Break</td>
@@ -872,7 +884,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>write_off_amount</code></td>
            <td >
                Currency</td>
@@ -886,7 +898,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>60</td>
+            <td>61</td>
            <td ><code>base_write_off_amount</code></td>
            <td >
                Currency</td>
@@ -900,7 +912,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td ><code>column_break_61</code></td>
            <td class="info">
                Column Break</td>
@@ -912,7 +924,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>write_off_account</code></td>
            <td >
                Link</td>
@@ -933,7 +945,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>63</td>
+            <td>64</td>
            <td ><code>write_off_cost_center</code></td>
            <td >
                Link</td>
@@ -954,7 +966,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>64</td>
+            <td>65</td>
            <td ><code>advances_section</code></td>
            <td >
                Section Break</td>
@@ -968,7 +980,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>65</td>
+            <td>66</td>
            <td ><code>get_advances_paid</code></td>
            <td >
                Button</td>
@@ -982,7 +994,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>66</td>
+            <td>67</td>
            <td ><code>advances</code></td>
            <td >
                Table</td>
@@ -1003,7 +1015,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>67</td>
+            <td>68</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -1017,7 +1029,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>68</td>
+            <td>69</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -1038,7 +1050,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>69</td>
+            <td>70</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -1050,7 +1062,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>70</td>
+            <td>71</td>
            <td ><code>contact_section</code></td>
            <td >
                Section Break</td>
@@ -1064,7 +1076,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td ><code>supplier_address</code></td>
            <td >
                Link</td>
@@ -1085,7 +1097,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>72</td>
+            <td>73</td>
            <td ><code>col_break23</code></td>
            <td class="info">
                Column Break</td>
@@ -1097,7 +1109,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>73</td>
+            <td>74</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -1118,7 +1130,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>74</td>
+            <td>75</td>
            <td ><code>printing_settings</code></td>
            <td >
                Section Break</td>
@@ -1130,7 +1142,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>75</td>
+            <td>76</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1151,7 +1163,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1172,7 +1184,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>77</td>
+            <td>78</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1186,7 +1198,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>78</td>
+            <td>79</td>
            <td class="danger" title="Mandatory"><code>credit_to</code></td>
            <td >
                Link</td>
@@ -1207,7 +1219,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>party_account_currency</code></td>
            <td >
                Link</td>
@@ -1228,7 +1240,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>80</td>
+            <td>81</td>
            <td ><code>is_opening</code></td>
            <td >
                Select</td>
@@ -1243,7 +1255,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>81</td>
+            <td>82</td>
            <td ><code>due_date</code></td>
            <td >
                Date</td>
@@ -1255,7 +1267,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>82</td>
+            <td>83</td>
            <td ><code>against_expense_account</code></td>
            <td >
                Small Text</td>
@@ -1267,7 +1279,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>83</td>
+            <td>84</td>
            <td ><code>column_break_63</code></td>
            <td class="info">
                Column Break</td>
@@ -1279,7 +1291,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>84</td>
+            <td>85</td>
            <td ><code>mode_of_payment</code></td>
            <td >
                Link</td>
@@ -1300,7 +1312,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>85</td>
+            <td>86</td>
            <td ><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1321,7 +1333,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>86</td>
+            <td>87</td>
            <td ><code>remarks</code></td>
            <td >
                Small Text</td>
@@ -1333,7 +1345,7 @@ Yes</pre>
        </tr>
        
        <tr class="info">
-            <td>87</td>
+            <td>88</td>
            <td ><code>recurring_invoice</code></td>
            <td >
                Section Break</td>
@@ -1347,7 +1359,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>88</td>
+            <td>89</td>
            <td ><code>is_recurring</code></td>
            <td >
                Check</td>
@@ -1359,7 +1371,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>89</td>
+            <td>90</td>
            <td ><code>recurring_type</code></td>
            <td >
                Select</td>
@@ -1377,7 +1389,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>90</td>
+            <td>91</td>
            <td ><code>from_date</code></td>
            <td >
                Date</td>
@@ -1390,7 +1402,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>91</td>
+            <td>92</td>
            <td ><code>to_date</code></td>
            <td >
                Date</td>
@@ -1403,7 +1415,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>92</td>
+            <td>93</td>
            <td ><code>repeat_on_day_of_month</code></td>
            <td >
                Int</td>
@@ -1416,7 +1428,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>93</td>
+            <td>94</td>
            <td ><code>end_date</code></td>
            <td >
                Date</td>
@@ -1429,7 +1441,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>94</td>
+            <td>95</td>
            <td ><code>column_break_82</code></td>
            <td class="info">
                Column Break</td>
@@ -1441,7 +1453,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>95</td>
+            <td>96</td>
            <td ><code>next_date</code></td>
            <td >
                Date</td>
@@ -1454,7 +1466,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>96</td>
+            <td>97</td>
            <td ><code>recurring_id</code></td>
            <td >
                Data</td>
@@ -1467,7 +1479,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>97</td>
+            <td>98</td>
            <td ><code>notification_email_address</code></td>
            <td >
                Small Text</td>
@@ -1480,7 +1492,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>98</td>
+            <td>99</td>
            <td ><code>recurring_print_format</code></td>
            <td >
                Link</td>
--- a/erpnext/docs/current/models/accounts/sales_invoice.html
+++ b/erpnext/docs/current/models/accounts/sales_invoice.html
@@ -810,32 +810,6 @@ Net Total</pre>
        
        <tr >
            <td>53</td>
-            <td ><code>column_break_51</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>54</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>55</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -848,8 +822,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>54</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>56</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>57</td>
            <td ><code>totals</code></td>
            <td >
                Section Break</td>
@@ -863,7 +875,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>57</td>
+            <td>58</td>
            <td class="danger" title="Mandatory"><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -877,7 +889,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>58</td>
+            <td>59</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -891,7 +903,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -904,7 +916,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>60</td>
+            <td>61</td>
            <td ><code>column_break5</code></td>
            <td class="info">
                Column Break</td>
@@ -916,7 +928,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td class="danger" title="Mandatory"><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -930,7 +942,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>rounded_total</code></td>
            <td >
                Currency</td>
@@ -944,7 +956,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>63</td>
+            <td>64</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -956,7 +968,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>64</td>
+            <td>65</td>
            <td ><code>total_advance</code></td>
            <td >
                Currency</td>
@@ -970,7 +982,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>65</td>
+            <td>66</td>
            <td ><code>outstanding_amount</code></td>
            <td >
                Currency</td>
@@ -984,7 +996,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>66</td>
+            <td>67</td>
            <td ><code>advances_section</code></td>
            <td >
                Section Break</td>
@@ -998,7 +1010,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td ><code>get_advances_received</code></td>
            <td >
                Button</td>
@@ -1012,7 +1024,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>68</td>
+            <td>69</td>
            <td ><code>advances</code></td>
            <td >
                Table</td>
@@ -1033,7 +1045,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>69</td>
+            <td>70</td>
            <td ><code>payments_section</code></td>
            <td >
                Section Break</td>
@@ -1047,7 +1059,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>70</td>
+            <td>71</td>
            <td ><code>mode_of_payment</code></td>
            <td >
                Link</td>
@@ -1068,7 +1080,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td ><code>cash_bank_account</code></td>
            <td >
                Link</td>
@@ -1089,7 +1101,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>72</td>
+            <td>73</td>
            <td ><code>column_break3</code></td>
            <td class="info">
                Column Break</td>
@@ -1101,7 +1113,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>73</td>
+            <td>74</td>
            <td ><code>paid_amount</code></td>
            <td >
                Currency</td>
@@ -1115,7 +1127,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>74</td>
+            <td>75</td>
            <td ><code>base_paid_amount</code></td>
            <td >
                Currency</td>
@@ -1129,7 +1141,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>75</td>
+            <td>76</td>
            <td ><code>column_break4</code></td>
            <td >
                Section Break</td>
@@ -1141,7 +1153,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td ><code>write_off_amount</code></td>
            <td >
                Currency</td>
@@ -1155,7 +1167,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>77</td>
+            <td>78</td>
            <td ><code>base_write_off_amount</code></td>
            <td >
                Currency</td>
@@ -1169,7 +1181,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>78</td>
+            <td>79</td>
            <td ><code>write_off_outstanding_amount_automatically</code></td>
            <td >
                Check</td>
@@ -1181,7 +1193,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>column_break_74</code></td>
            <td class="info">
                Column Break</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>80</td>
+            <td>81</td>
            <td ><code>write_off_account</code></td>
            <td >
                Link</td>
@@ -1214,7 +1226,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>81</td>
+            <td>82</td>
            <td ><code>write_off_cost_center</code></td>
            <td >
                Link</td>
@@ -1235,7 +1247,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>82</td>
+            <td>83</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -1247,7 +1259,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>83</td>
+            <td>84</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -1268,7 +1280,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>84</td>
+            <td>85</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -1280,7 +1292,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>85</td>
+            <td>86</td>
            <td ><code>edit_printing_settings</code></td>
            <td >
                Section Break</td>
@@ -1292,7 +1304,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>86</td>
+            <td>87</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1313,7 +1325,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>87</td>
+            <td>88</td>
            <td ><code>column_break_84</code></td>
            <td class="info">
                Column Break</td>
@@ -1325,7 +1337,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>88</td>
+            <td>89</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1346,7 +1358,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>89</td>
+            <td>90</td>
            <td ><code>contact_section</code></td>
            <td >
                Section Break</td>
@@ -1360,7 +1372,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>90</td>
+            <td>91</td>
            <td ><code>project_name</code></td>
            <td >
                Link</td>
@@ -1381,7 +1393,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>91</td>
+            <td>92</td>
            <td class="danger" title="Mandatory"><code>territory</code></td>
            <td >
                Link</td>
@@ -1402,7 +1414,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>92</td>
+            <td>93</td>
            <td ><code>customer_group</code></td>
            <td >
                Link</td>
@@ -1423,7 +1435,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>93</td>
+            <td>94</td>
            <td ><code>col_break23</code></td>
            <td class="info">
                Column Break</td>
@@ -1435,7 +1447,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>94</td>
+            <td>95</td>
            <td ><code>customer_address</code></td>
            <td >
                Link</td>
@@ -1456,7 +1468,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>95</td>
+            <td>96</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -1477,7 +1489,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>96</td>
+            <td>97</td>
            <td ><code>campaign</code></td>
            <td >
                Link</td>
@@ -1498,7 +1510,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>97</td>
+            <td>98</td>
            <td ><code>source</code></td>
            <td >
                Select</td>
@@ -1521,7 +1533,7 @@ Campaign</pre>
        </tr>
        
        <tr class="info">
-            <td>98</td>
+            <td>99</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1535,7 +1547,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>99</td>
+            <td>100</td>
            <td class="danger" title="Mandatory"><code>debit_to</code></td>
            <td >
                Link</td>
@@ -1556,7 +1568,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>100</td>
+            <td>101</td>
            <td ><code>party_account_currency</code></td>
            <td >
                Link</td>
@@ -1577,7 +1589,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>101</td>
+            <td>102</td>
            <td ><code>is_opening</code></td>
            <td >
                Select</td>
@@ -1592,7 +1604,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>102</td>
+            <td>103</td>
            <td ><code>c_form_applicable</code></td>
            <td >
                Select</td>
@@ -1607,7 +1619,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>103</td>
+            <td>104</td>
            <td ><code>c_form_no</code></td>
            <td >
                Link</td>
@@ -1628,7 +1640,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>104</td>
+            <td>105</td>
            <td ><code>column_break8</code></td>
            <td class="info">
                Column Break</td>
@@ -1640,7 +1652,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>105</td>
+            <td>106</td>
            <td ><code>posting_time</code></td>
            <td >
                Time</td>
@@ -1652,7 +1664,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>106</td>
+            <td>107</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1673,7 +1685,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>107</td>
+            <td>108</td>
            <td ><code>remarks</code></td>
            <td >
                Small Text</td>
@@ -1685,7 +1697,7 @@ Yes</pre>
        </tr>
        
        <tr class="info">
-            <td>108</td>
+            <td>109</td>
            <td ><code>sales_team_section_break</code></td>
            <td >
                Section Break</td>
@@ -1699,7 +1711,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>109</td>
+            <td>110</td>
            <td ><code>sales_partner</code></td>
            <td >
                Link</td>
@@ -1720,7 +1732,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>110</td>
+            <td>111</td>
            <td ><code>column_break10</code></td>
            <td class="info">
                Column Break</td>
@@ -1732,7 +1744,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>111</td>
+            <td>112</td>
            <td ><code>commission_rate</code></td>
            <td >
                Float</td>
@@ -1744,7 +1756,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>112</td>
+            <td>113</td>
            <td ><code>total_commission</code></td>
            <td >
                Currency</td>
@@ -1758,7 +1770,7 @@ Yes</pre>
        </tr>
        
        <tr class="info">
-            <td>113</td>
+            <td>114</td>
            <td ><code>section_break2</code></td>
            <td >
                Section Break</td>
@@ -1770,7 +1782,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>114</td>
+            <td>115</td>
            <td ><code>sales_team</code></td>
            <td >
                Table</td>
@@ -1791,7 +1803,7 @@ Yes</pre>
        </tr>
        
        <tr class="info">
-            <td>115</td>
+            <td>116</td>
            <td ><code>recurring_invoice</code></td>
            <td >
                Section Break</td>
@@ -1805,7 +1817,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>116</td>
+            <td>117</td>
            <td ><code>column_break11</code></td>
            <td class="info">
                Column Break</td>
@@ -1817,7 +1829,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>117</td>
+            <td>118</td>
            <td ><code>is_recurring</code></td>
            <td >
                Check</td>
@@ -1830,7 +1842,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>118</td>
+            <td>119</td>
            <td ><code>recurring_type</code></td>
            <td >
                Select</td>
@@ -1849,7 +1861,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>119</td>
+            <td>120</td>
            <td ><code>from_date</code></td>
            <td >
                Date</td>
@@ -1862,7 +1874,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>120</td>
+            <td>121</td>
            <td ><code>to_date</code></td>
            <td >
                Date</td>
@@ -1875,7 +1887,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>121</td>
+            <td>122</td>
            <td ><code>repeat_on_day_of_month</code></td>
            <td >
                Int</td>
@@ -1888,7 +1900,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>122</td>
+            <td>123</td>
            <td ><code>end_date</code></td>
            <td >
                Date</td>
@@ -1901,7 +1913,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>123</td>
+            <td>124</td>
            <td ><code>column_break12</code></td>
            <td class="info">
                Column Break</td>
@@ -1913,7 +1925,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>124</td>
+            <td>125</td>
            <td ><code>next_date</code></td>
            <td >
                Date</td>
@@ -1927,7 +1939,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>125</td>
+            <td>126</td>
            <td ><code>recurring_id</code></td>
            <td >
                Data</td>
@@ -1940,7 +1952,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>126</td>
+            <td>127</td>
            <td ><code>notification_email_address</code></td>
            <td >
                Small Text</td>
@@ -1953,7 +1965,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>127</td>
+            <td>128</td>
            <td ><code>recurring_print_format</code></td>
            <td >
                Link</td>
@@ -1974,7 +1986,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>128</td>
+            <td>129</td>
            <td ><code>against_income_account</code></td>
            <td >
                Small Text</td>
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -835,32 +835,6 @@ Net Total</pre>
        
        <tr >
            <td>55</td>
-            <td ><code>column_break_45</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>56</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>57</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -873,8 +847,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>56</td>
+            <td ><code>column_break_45</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>58</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>59</td>
            <td ><code>totals_section</code></td>
            <td >
                Section Break</td>
@@ -886,7 +898,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -900,7 +912,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>60</td>
+            <td>61</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -913,7 +925,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -927,7 +939,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>advance_paid</code></td>
            <td >
                Currency</td>
@@ -939,7 +951,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>63</td>
+            <td>64</td>
            <td ><code>column_break4</code></td>
            <td class="info">
                Column Break</td>
@@ -951,7 +963,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>64</td>
+            <td>65</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -965,7 +977,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>65</td>
+            <td>66</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -977,7 +989,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>66</td>
+            <td>67</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -991,7 +1003,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -1012,7 +1024,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>68</td>
+            <td>69</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -1024,7 +1036,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>69</td>
+            <td>70</td>
            <td ><code>contact_section</code></td>
            <td >
                Section Break</td>
@@ -1038,7 +1050,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>70</td>
+            <td>71</td>
            <td ><code>supplier_address</code></td>
            <td >
                Link</td>
@@ -1059,7 +1071,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td ><code>cb_contact</code></td>
            <td class="info">
                Column Break</td>
@@ -1071,7 +1083,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>72</td>
+            <td>73</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -1092,7 +1104,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>73</td>
+            <td>74</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1104,7 +1116,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>74</td>
+            <td>75</td>
            <td class="danger" title="Mandatory"><code>status</code></td>
            <td >
                Select</td>
@@ -1127,7 +1139,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>75</td>
+            <td>76</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1148,7 +1160,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td ><code>ref_sq</code></td>
            <td >
                Data</td>
@@ -1160,7 +1172,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>77</td>
+            <td>78</td>
            <td ><code>column_break_74</code></td>
            <td class="info">
                Column Break</td>
@@ -1172,7 +1184,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>78</td>
+            <td>79</td>
            <td ><code>per_received</code></td>
            <td >
                Percent</td>
@@ -1184,7 +1196,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>per_billed</code></td>
            <td >
                Percent</td>
@@ -1196,7 +1208,7 @@ Delivered</pre>
        </tr>
        
        <tr class="info">
-            <td>80</td>
+            <td>81</td>
            <td ><code>column_break5</code></td>
            <td >
                Section Break</td>
@@ -1208,7 +1220,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>81</td>
+            <td>82</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1229,7 +1241,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>82</td>
+            <td>83</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1250,7 +1262,7 @@ Delivered</pre>
        </tr>
        
        <tr class="info">
-            <td>83</td>
+            <td>84</td>
            <td ><code>raw_material_details</code></td>
            <td >
                Section Break</td>
@@ -1264,7 +1276,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>84</td>
+            <td>85</td>
            <td ><code>supplied_items</code></td>
            <td >
                Table</td>
@@ -1285,7 +1297,7 @@ Delivered</pre>
        </tr>
        
        <tr class="info">
-            <td>85</td>
+            <td>86</td>
            <td ><code>recurring_order</code></td>
            <td >
                Section Break</td>
@@ -1299,7 +1311,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>86</td>
+            <td>87</td>
            <td ><code>column_break</code></td>
            <td class="info">
                Column Break</td>
@@ -1311,7 +1323,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>87</td>
+            <td>88</td>
            <td ><code>is_recurring</code></td>
            <td >
                Check</td>
@@ -1323,7 +1335,7 @@ Delivered</pre>
        </tr>
        
        <tr >
-            <td>88</td>
+            <td>89</td>
            <td ><code>recurring_type</code></td>
            <td >
                Select</td>
@@ -1340,7 +1352,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>89</td>
+            <td>90</td>
            <td ><code>from_date</code></td>
            <td >
                Date</td>
@@ -1353,7 +1365,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>90</td>
+            <td>91</td>
            <td ><code>to_date</code></td>
            <td >
                Date</td>
@@ -1366,7 +1378,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>91</td>
+            <td>92</td>
            <td ><code>repeat_on_day_of_month</code></td>
            <td >
                Int</td>
@@ -1379,7 +1391,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>92</td>
+            <td>93</td>
            <td ><code>end_date</code></td>
            <td >
                Date</td>
@@ -1392,7 +1404,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>93</td>
+            <td>94</td>
            <td ><code>column_break83</code></td>
            <td class="info">
                Column Break</td>
@@ -1404,7 +1416,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>94</td>
+            <td>95</td>
            <td ><code>next_date</code></td>
            <td >
                Date</td>
@@ -1417,7 +1429,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>95</td>
+            <td>96</td>
            <td ><code>recurring_id</code></td>
            <td >
                Data</td>
@@ -1429,7 +1441,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>96</td>
+            <td>97</td>
            <td ><code>notification_email_address</code></td>
            <td >
                Small Text</td>
@@ -1442,7 +1454,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>97</td>
+            <td>98</td>
            <td ><code>recurring_print_format</code></td>
            <td >
                Link</td>
--- a/erpnext/docs/current/models/buying/supplier_quotation.html
+++ b/erpnext/docs/current/models/buying/supplier_quotation.html
@@ -673,32 +673,6 @@ Net Total</pre>
        
        <tr >
            <td>44</td>
-            <td ><code>column_break_43</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>45</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>46</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -711,8 +685,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>45</td>
+            <td ><code>column_break_43</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>47</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>48</td>
            <td ><code>section_break_46</code></td>
            <td >
                Section Break</td>
@@ -724,7 +736,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>48</td>
+            <td>49</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -738,7 +750,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>49</td>
+            <td>50</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -750,7 +762,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>50</td>
+            <td>51</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -764,7 +776,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>51</td>
+            <td>52</td>
            <td ><code>column_break4</code></td>
            <td class="info">
                Column Break</td>
@@ -776,7 +788,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>52</td>
+            <td>53</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -790,7 +802,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>53</td>
+            <td>54</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -802,7 +814,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>54</td>
+            <td>55</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -816,7 +828,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>55</td>
+            <td>56</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -837,7 +849,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>56</td>
+            <td>57</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -849,7 +861,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>57</td>
+            <td>58</td>
            <td ><code>contact_section</code></td>
            <td >
                Section Break</td>
@@ -863,7 +875,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>58</td>
+            <td>59</td>
            <td ><code>supplier_address</code></td>
            <td >
                Link</td>
@@ -884,7 +896,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -905,7 +917,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>60</td>
+            <td>61</td>
            <td ><code>printing_settings</code></td>
            <td >
                Section Break</td>
@@ -917,7 +929,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -938,7 +950,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -959,7 +971,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>63</td>
+            <td>64</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -973,7 +985,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>64</td>
+            <td>65</td>
            <td class="danger" title="Mandatory"><code>status</code></td>
            <td >
                Select</td>
@@ -991,7 +1003,7 @@ Cancelled</pre>
        </tr>
        
        <tr >
-            <td>65</td>
+            <td>66</td>
            <td ><code>is_subcontracted</code></td>
            <td >
                Select</td>
@@ -1007,7 +1019,7 @@ No</pre>
        </tr>
        
        <tr >
-            <td>66</td>
+            <td>67</td>
            <td ><code>column_break_57</code></td>
            <td class="info">
                Column Break</td>
@@ -1019,7 +1031,7 @@ No</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
--- a/erpnext/docs/current/models/hr/department.html
+++ b/erpnext/docs/current/models/hr/department.html
@@ -106,6 +106,8 @@
        <ul>
        
 			
+        
+			
            <li>


@@ -124,6 +126,8 @@
 			
        
 			
+        
+			
            <li>


@@ -142,6 +146,8 @@
 			
        
 			
+        
+			
            <li>


--- a/erpnext/docs/current/models/hr/employee.html
+++ b/erpnext/docs/current/models/hr/employee.html
@@ -1622,6 +1622,8 @@ Health Concerns</pre>
 			
        
 			
+        
+			
            <li>


--- a/erpnext/docs/current/models/selling/quotation.html
+++ b/erpnext/docs/current/models/selling/quotation.html
@@ -728,32 +728,6 @@ Net Total</pre>
        
        <tr >
            <td>47</td>
-            <td ><code>column_break_46</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -766,8 +740,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>50</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
            <td ><code>totals</code></td>
            <td >
                Section Break</td>
@@ -781,7 +793,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>51</td>
+            <td>52</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -795,7 +807,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>52</td>
+            <td>53</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -809,7 +821,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>53</td>
+            <td>54</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -822,7 +834,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>54</td>
+            <td>55</td>
            <td ><code>column_break3</code></td>
            <td class="info">
                Column Break</td>
@@ -834,7 +846,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>55</td>
+            <td>56</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -848,7 +860,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>56</td>
+            <td>57</td>
            <td ><code>rounded_total</code></td>
            <td >
                Currency</td>
@@ -862,7 +874,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>57</td>
+            <td>58</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -874,7 +886,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>58</td>
+            <td>59</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -888,7 +900,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -909,7 +921,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>60</td>
+            <td>61</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -921,7 +933,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>61</td>
+            <td>62</td>
            <td ><code>contact_section</code></td>
            <td >
                Section Break</td>
@@ -935,7 +947,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td class="danger" title="Mandatory"><code>territory</code></td>
            <td >
                Link</td>
@@ -956,7 +968,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>63</td>
+            <td>64</td>
            <td ><code>customer_group</code></td>
            <td >
                Link</td>
@@ -977,7 +989,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>64</td>
+            <td>65</td>
            <td ><code>shipping_address_name</code></td>
            <td >
                Link</td>
@@ -998,7 +1010,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>65</td>
+            <td>66</td>
            <td ><code>shipping_address</code></td>
            <td >
                Small Text</td>
@@ -1010,7 +1022,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>66</td>
+            <td>67</td>
            <td ><code>col_break98</code></td>
            <td class="info">
                Column Break</td>
@@ -1022,7 +1034,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td ><code>customer_address</code></td>
            <td >
                Link</td>
@@ -1043,7 +1055,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>68</td>
+            <td>69</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -1064,7 +1076,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>69</td>
+            <td>70</td>
            <td ><code>print_settings</code></td>
            <td >
                Section Break</td>
@@ -1076,7 +1088,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>70</td>
+            <td>71</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1097,7 +1109,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1118,7 +1130,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>72</td>
+            <td>73</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1132,7 +1144,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>73</td>
+            <td>74</td>
            <td ><code>campaign</code></td>
            <td >
                Link</td>
@@ -1153,7 +1165,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>74</td>
+            <td>75</td>
            <td ><code>source</code></td>
            <td >
                Select</td>
@@ -1176,7 +1188,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>75</td>
+            <td>76</td>
            <td ><code>order_lost_reason</code></td>
            <td >
                Small Text</td>
@@ -1188,7 +1200,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td ><code>column_break4</code></td>
            <td class="info">
                Column Break</td>
@@ -1200,7 +1212,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>77</td>
+            <td>78</td>
            <td class="danger" title="Mandatory"><code>status</code></td>
            <td >
                Select</td>
@@ -1220,7 +1232,7 @@ Replied</pre>
        </tr>
        
        <tr >
-            <td>78</td>
+            <td>79</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1241,7 +1253,7 @@ Replied</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>enq_det</code></td>
            <td >
                Text</td>
--- a/erpnext/docs/current/models/selling/sales_order.html
+++ b/erpnext/docs/current/models/selling/sales_order.html
@@ -772,32 +772,6 @@ Net Total</pre>
        
        <tr >
            <td>51</td>
-            <td ><code>column_break_50</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>52</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>53</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -810,8 +784,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>52</td>
+            <td ><code>column_break_50</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>54</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>55</td>
            <td ><code>totals</code></td>
            <td >
                Section Break</td>
@@ -825,7 +837,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>55</td>
+            <td>56</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -839,7 +851,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>56</td>
+            <td>57</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -853,7 +865,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>57</td>
+            <td>58</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -866,7 +878,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>58</td>
+            <td>59</td>
            <td ><code>column_break3</code></td>
            <td class="info">
                Column Break</td>
@@ -878,7 +890,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -892,7 +904,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>60</td>
+            <td>61</td>
            <td ><code>rounded_total</code></td>
            <td >
                Currency</td>
@@ -906,7 +918,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -918,7 +930,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>advance_paid</code></td>
            <td >
                Currency</td>
@@ -932,7 +944,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>63</td>
+            <td>64</td>
            <td ><code>packing_list</code></td>
            <td >
                Section Break</td>
@@ -946,7 +958,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>64</td>
+            <td>65</td>
            <td ><code>packed_items</code></td>
            <td >
                Table</td>
@@ -967,7 +979,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>65</td>
+            <td>66</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -981,7 +993,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>66</td>
+            <td>67</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -1002,7 +1014,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -1014,7 +1026,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>68</td>
+            <td>69</td>
            <td ><code>contact_info</code></td>
            <td >
                Section Break</td>
@@ -1028,7 +1040,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>69</td>
+            <td>70</td>
            <td ><code>col_break45</code></td>
            <td class="info">
                Column Break</td>
@@ -1040,7 +1052,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>70</td>
+            <td>71</td>
            <td class="danger" title="Mandatory"><code>territory</code></td>
            <td >
                Link</td>
@@ -1061,7 +1073,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td class="danger" title="Mandatory"><code>customer_group</code></td>
            <td >
                Link</td>
@@ -1082,7 +1094,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>72</td>
+            <td>73</td>
            <td ><code>col_break46</code></td>
            <td class="info">
                Column Break</td>
@@ -1094,7 +1106,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>73</td>
+            <td>74</td>
            <td ><code>customer_address</code></td>
            <td >
                Link</td>
@@ -1115,7 +1127,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>74</td>
+            <td>75</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -1136,7 +1148,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>75</td>
+            <td>76</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1150,7 +1162,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td ><code>project_name</code></td>
            <td >
                Link</td>
@@ -1172,7 +1184,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>77</td>
+            <td>78</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>78</td>
+            <td>79</td>
            <td ><code>column_break_77</code></td>
            <td class="info">
                Column Break</td>
@@ -1205,7 +1217,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>source</code></td>
            <td >
                Select</td>
@@ -1228,7 +1240,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>80</td>
+            <td>81</td>
            <td ><code>campaign</code></td>
            <td >
                Link</td>
@@ -1249,7 +1261,7 @@ Campaign</pre>
        </tr>
        
        <tr class="info">
-            <td>81</td>
+            <td>82</td>
            <td ><code>printing_details</code></td>
            <td >
                Section Break</td>
@@ -1261,7 +1273,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>82</td>
+            <td>83</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1282,7 +1294,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>83</td>
+            <td>84</td>
            <td ><code>column_break4</code></td>
            <td class="info">
                Column Break</td>
@@ -1294,7 +1306,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>84</td>
+            <td>85</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1315,7 +1327,7 @@ Campaign</pre>
        </tr>
        
        <tr class="info">
-            <td>85</td>
+            <td>86</td>
            <td ><code>section_break_78</code></td>
            <td >
                Section Break</td>
@@ -1327,7 +1339,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>86</td>
+            <td>87</td>
            <td class="danger" title="Mandatory"><code>status</code></td>
            <td >
                Select</td>
@@ -1349,7 +1361,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>87</td>
+            <td>88</td>
            <td ><code>delivery_status</code></td>
            <td >
                Select</td>
@@ -1367,7 +1379,7 @@ Not Applicable</pre>
        </tr>
        
        <tr >
-            <td>88</td>
+            <td>89</td>
            <td ><code>per_delivered</code></td>
            <td >
                Percent</td>
@@ -1380,7 +1392,7 @@ Not Applicable</pre>
        </tr>
        
        <tr >
-            <td>89</td>
+            <td>90</td>
            <td ><code>column_break_81</code></td>
            <td class="info">
                Column Break</td>
@@ -1392,7 +1404,7 @@ Not Applicable</pre>
        </tr>
        
        <tr >
-            <td>90</td>
+            <td>91</td>
            <td ><code>per_billed</code></td>
            <td >
                Percent</td>
@@ -1405,7 +1417,7 @@ Not Applicable</pre>
        </tr>
        
        <tr >
-            <td>91</td>
+            <td>92</td>
            <td ><code>billing_status</code></td>
            <td >
                Select</td>
@@ -1422,7 +1434,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>92</td>
+            <td>93</td>
            <td ><code>sales_team_section_break</code></td>
            <td >
                Section Break</td>
@@ -1436,7 +1448,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>93</td>
+            <td>94</td>
            <td ><code>sales_partner</code></td>
            <td >
                Link</td>
@@ -1457,7 +1469,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>94</td>
+            <td>95</td>
            <td ><code>column_break7</code></td>
            <td class="info">
                Column Break</td>
@@ -1469,7 +1481,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>95</td>
+            <td>96</td>
            <td ><code>commission_rate</code></td>
            <td >
                Float</td>
@@ -1481,7 +1493,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>96</td>
+            <td>97</td>
            <td ><code>total_commission</code></td>
            <td >
                Currency</td>
@@ -1495,7 +1507,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>97</td>
+            <td>98</td>
            <td ><code>section_break1</code></td>
            <td >
                Section Break</td>
@@ -1507,7 +1519,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>98</td>
+            <td>99</td>
            <td ><code>sales_team</code></td>
            <td >
                Table</td>
@@ -1528,7 +1540,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>99</td>
+            <td>100</td>
            <td ><code>recurring_order</code></td>
            <td >
                Section Break</td>
@@ -1542,7 +1554,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>100</td>
+            <td>101</td>
            <td ><code>is_recurring</code></td>
            <td >
                Check</td>
@@ -1555,7 +1567,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>101</td>
+            <td>102</td>
            <td ><code>recurring_type</code></td>
            <td >
                Select</td>
@@ -1574,7 +1586,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>102</td>
+            <td>103</td>
            <td ><code>from_date</code></td>
            <td >
                Date</td>
@@ -1587,7 +1599,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>103</td>
+            <td>104</td>
            <td ><code>to_date</code></td>
            <td >
                Date</td>
@@ -1600,7 +1612,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>104</td>
+            <td>105</td>
            <td ><code>repeat_on_day_of_month</code></td>
            <td >
                Int</td>
@@ -1613,7 +1625,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>105</td>
+            <td>106</td>
            <td ><code>end_date</code></td>
            <td >
                Date</td>
@@ -1626,7 +1638,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>106</td>
+            <td>107</td>
            <td ><code>column_break83</code></td>
            <td class="info">
                Column Break</td>
@@ -1638,7 +1650,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>107</td>
+            <td>108</td>
            <td ><code>next_date</code></td>
            <td >
                Date</td>
@@ -1651,7 +1663,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>108</td>
+            <td>109</td>
            <td ><code>recurring_id</code></td>
            <td >
                Data</td>
@@ -1663,7 +1675,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>109</td>
+            <td>110</td>
            <td ><code>notification_email_address</code></td>
            <td >
                Small Text</td>
@@ -1676,7 +1688,7 @@ Yearly</pre>
        </tr>
        
        <tr >
-            <td>110</td>
+            <td>111</td>
            <td ><code>recurring_print_format</code></td>
            <td >
                Link</td>
--- a/erpnext/docs/current/models/stock/delivery_note.html
+++ b/erpnext/docs/current/models/stock/delivery_note.html
@@ -834,32 +834,6 @@ Net Total</pre>
        
        <tr >
            <td>54</td>
-            <td ><code>column_break_51</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>55</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>56</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -872,8 +846,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>55</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>57</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>58</td>
            <td ><code>totals</code></td>
            <td >
                Section Break</td>
@@ -887,7 +899,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>58</td>
+            <td>59</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -901,7 +913,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -915,7 +927,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>60</td>
+            <td>61</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -928,7 +940,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td ><code>column_break3</code></td>
            <td class="info">
                Column Break</td>
@@ -940,7 +952,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -954,7 +966,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>63</td>
+            <td>64</td>
            <td ><code>rounded_total</code></td>
            <td >
                Currency</td>
@@ -968,7 +980,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>64</td>
+            <td>65</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -981,7 +993,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>65</td>
+            <td>66</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -995,7 +1007,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>66</td>
+            <td>67</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -1016,7 +1028,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -1028,7 +1040,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>68</td>
+            <td>69</td>
            <td ><code>transporter_info</code></td>
            <td >
                Section Break</td>
@@ -1042,7 +1054,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>69</td>
+            <td>70</td>
            <td ><code>transporter_name</code></td>
            <td >
                Data</td>
@@ -1054,7 +1066,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>70</td>
+            <td>71</td>
            <td ><code>col_break34</code></td>
            <td class="info">
                Column Break</td>
@@ -1066,7 +1078,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td ><code>lr_no</code></td>
            <td >
                Data</td>
@@ -1078,7 +1090,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>72</td>
+            <td>73</td>
            <td ><code>lr_date</code></td>
            <td >
                Date</td>
@@ -1090,7 +1102,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>73</td>
+            <td>74</td>
            <td ><code>contact_info</code></td>
            <td >
                Section Break</td>
@@ -1104,7 +1116,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>74</td>
+            <td>75</td>
            <td class="danger" title="Mandatory"><code>territory</code></td>
            <td >
                Link</td>
@@ -1125,7 +1137,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>75</td>
+            <td>76</td>
            <td ><code>customer_group</code></td>
            <td >
                Link</td>
@@ -1146,7 +1158,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td ><code>col_break21</code></td>
            <td class="info">
                Column Break</td>
@@ -1158,7 +1170,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>77</td>
+            <td>78</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -1179,7 +1191,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>78</td>
+            <td>79</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>project_name</code></td>
            <td >
                Link</td>
@@ -1215,7 +1227,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>80</td>
+            <td>81</td>
            <td ><code>campaign</code></td>
            <td >
                Link</td>
@@ -1236,7 +1248,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>81</td>
+            <td>82</td>
            <td ><code>source</code></td>
            <td >
                Select</td>
@@ -1259,7 +1271,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>82</td>
+            <td>83</td>
            <td ><code>column_break5</code></td>
            <td class="info">
                Column Break</td>
@@ -1271,7 +1283,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>83</td>
+            <td>84</td>
            <td class="danger" title="Mandatory"><code>posting_time</code></td>
            <td >
                Time</td>
@@ -1284,7 +1296,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>84</td>
+            <td>85</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1305,7 +1317,7 @@ Campaign</pre>
        </tr>
        
        <tr class="info">
-            <td>85</td>
+            <td>86</td>
            <td ><code>printing_details</code></td>
            <td >
                Section Break</td>
@@ -1317,7 +1329,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>86</td>
+            <td>87</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1338,7 +1350,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>87</td>
+            <td>88</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1359,7 +1371,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>88</td>
+            <td>89</td>
            <td ><code>column_break_88</code></td>
            <td class="info">
                Column Break</td>
@@ -1371,7 +1383,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>89</td>
+            <td>90</td>
            <td ><code>print_without_amount</code></td>
            <td >
                Check</td>
@@ -1383,7 +1395,7 @@ Campaign</pre>
        </tr>
        
        <tr class="info">
-            <td>90</td>
+            <td>91</td>
            <td ><code>section_break_83</code></td>
            <td >
                Section Break</td>
@@ -1395,7 +1407,7 @@ Campaign</pre>
        </tr>
        
        <tr >
-            <td>91</td>
+            <td>92</td>
            <td class="danger" title="Mandatory"><code>status</code></td>
            <td >
                Select</td>
@@ -1413,7 +1425,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>92</td>
+            <td>93</td>
            <td ><code>per_installed</code></td>
            <td >
                Percent</td>
@@ -1426,7 +1438,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>93</td>
+            <td>94</td>
            <td ><code>installation_status</code></td>
            <td >
                Select</td>
@@ -1438,7 +1450,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>94</td>
+            <td>95</td>
            <td ><code>column_break_89</code></td>
            <td class="info">
                Column Break</td>
@@ -1450,7 +1462,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>95</td>
+            <td>96</td>
            <td ><code>to_warehouse</code></td>
            <td >
                Link</td>
@@ -1472,7 +1484,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>96</td>
+            <td>97</td>
            <td ><code>excise_page</code></td>
            <td >
                Data</td>
@@ -1484,7 +1496,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>97</td>
+            <td>98</td>
            <td ><code>instructions</code></td>
            <td >
                Text</td>
@@ -1496,7 +1508,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>98</td>
+            <td>99</td>
            <td ><code>sales_team_section_break</code></td>
            <td >
                Section Break</td>
@@ -1510,7 +1522,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>99</td>
+            <td>100</td>
            <td ><code>sales_partner</code></td>
            <td >
                Link</td>
@@ -1531,7 +1543,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>100</td>
+            <td>101</td>
            <td ><code>column_break7</code></td>
            <td class="info">
                Column Break</td>
@@ -1543,7 +1555,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>101</td>
+            <td>102</td>
            <td ><code>commission_rate</code></td>
            <td >
                Float</td>
@@ -1555,7 +1567,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>102</td>
+            <td>103</td>
            <td ><code>total_commission</code></td>
            <td >
                Currency</td>
@@ -1569,7 +1581,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>103</td>
+            <td>104</td>
            <td ><code>section_break1</code></td>
            <td >
                Section Break</td>
@@ -1581,7 +1593,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>104</td>
+            <td>105</td>
            <td ><code>sales_team</code></td>
            <td >
                Table</td>
--- a/erpnext/docs/current/models/stock/price_list.html
+++ b/erpnext/docs/current/models/stock/price_list.html
@@ -391,8 +391,6 @@ Price List Master
 			
        
 			
-        
-			
            <li>


--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -706,32 +706,6 @@ Net Total</pre>
        
        <tr >
            <td>47</td>
-            <td ><code>column_break_44</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>48</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>49</td>
            <td ><code>base_discount_amount</code></td>
            <td >
                Currency</td>
@@ -744,8 +718,46 @@ Net Total</pre>
            </td>
        </tr>
        
-        <tr class="info">
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_44</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
            <td>50</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
            <td ><code>section_break_46</code></td>
            <td >
                Section Break</td>
@@ -757,7 +769,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>51</td>
+            <td>52</td>
            <td ><code>base_grand_total</code></td>
            <td >
                Currency</td>
@@ -771,7 +783,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>52</td>
+            <td>53</td>
            <td ><code>base_in_words</code></td>
            <td >
                Data</td>
@@ -783,7 +795,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>53</td>
+            <td>54</td>
            <td ><code>base_rounded_total</code></td>
            <td >
                Currency</td>
@@ -797,7 +809,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>54</td>
+            <td>55</td>
            <td ><code>column_break_50</code></td>
            <td class="info">
                Column Break</td>
@@ -809,7 +821,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>55</td>
+            <td>56</td>
            <td ><code>grand_total</code></td>
            <td >
                Currency</td>
@@ -823,7 +835,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>56</td>
+            <td>57</td>
            <td ><code>in_words</code></td>
            <td >
                Data</td>
@@ -835,7 +847,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>57</td>
+            <td>58</td>
            <td ><code>terms_section_break</code></td>
            <td >
                Section Break</td>
@@ -849,7 +861,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>58</td>
+            <td>59</td>
            <td ><code>tc_name</code></td>
            <td >
                Link</td>
@@ -870,7 +882,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>59</td>
+            <td>60</td>
            <td ><code>terms</code></td>
            <td >
                Text Editor</td>
@@ -882,7 +894,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>60</td>
+            <td>61</td>
            <td ><code>contact_section</code></td>
            <td >
                Section Break</td>
@@ -896,7 +908,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>61</td>
+            <td>62</td>
            <td ><code>supplier_address</code></td>
            <td >
                Link</td>
@@ -917,7 +929,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>62</td>
+            <td>63</td>
            <td ><code>column_break_57</code></td>
            <td class="info">
                Column Break</td>
@@ -929,7 +941,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>63</td>
+            <td>64</td>
            <td ><code>contact_person</code></td>
            <td >
                Link</td>
@@ -950,7 +962,7 @@ Net Total</pre>
        </tr>
        
        <tr class="info">
-            <td>64</td>
+            <td>65</td>
            <td ><code>raw_material_details</code></td>
            <td >
                Section Break</td>
@@ -964,7 +976,7 @@ Net Total</pre>
        </tr>
        
        <tr >
-            <td>65</td>
+            <td>66</td>
            <td ><code>is_subcontracted</code></td>
            <td >
                Select</td>
@@ -979,7 +991,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>66</td>
+            <td>67</td>
            <td ><code>supplier_warehouse</code></td>
            <td >
                Link</td>
@@ -1000,7 +1012,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>67</td>
+            <td>68</td>
            <td ><code>supplied_items</code></td>
            <td >
                Table</td>
@@ -1021,7 +1033,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>68</td>
+            <td>69</td>
            <td ><code>bill_no</code></td>
            <td >
                Data</td>
@@ -1033,7 +1045,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>69</td>
+            <td>70</td>
            <td ><code>bill_date</code></td>
            <td >
                Date</td>
@@ -1045,7 +1057,7 @@ Yes</pre>
        </tr>
        
        <tr class="info">
-            <td>70</td>
+            <td>71</td>
            <td ><code>more_info</code></td>
            <td >
                Section Break</td>
@@ -1059,7 +1071,7 @@ Yes</pre>
        </tr>
        
        <tr >
-            <td>71</td>
+            <td>72</td>
            <td class="danger" title="Mandatory"><code>status</code></td>
            <td >
                Select</td>
@@ -1077,7 +1089,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>72</td>
+            <td>73</td>
            <td ><code>rejected_warehouse</code></td>
            <td >
                Link</td>
@@ -1099,7 +1111,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>73</td>
+            <td>74</td>
            <td ><code>amended_from</code></td>
            <td >
                Link</td>
@@ -1120,7 +1132,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>74</td>
+            <td>75</td>
            <td ><code>range</code></td>
            <td >
                Data</td>
@@ -1132,7 +1144,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>75</td>
+            <td>76</td>
            <td ><code>column_break4</code></td>
            <td class="info">
                Column Break</td>
@@ -1144,7 +1156,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>76</td>
+            <td>77</td>
            <td class="danger" title="Mandatory"><code>company</code></td>
            <td >
                Link</td>
@@ -1165,7 +1177,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>77</td>
+            <td>78</td>
            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
            <td >
                Link</td>
@@ -1186,7 +1198,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>78</td>
+            <td>79</td>
            <td ><code>printing_settings</code></td>
            <td >
                Section Break</td>
@@ -1198,7 +1210,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>79</td>
+            <td>80</td>
            <td ><code>letter_head</code></td>
            <td >
                Link</td>
@@ -1219,7 +1231,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>80</td>
+            <td>81</td>
            <td ><code>select_print_heading</code></td>
            <td >
                Link</td>
@@ -1240,7 +1252,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>81</td>
+            <td>82</td>
            <td ><code>other_details</code></td>
            <td >
                HTML</td>
@@ -1252,7 +1264,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>82</td>
+            <td>83</td>
            <td ><code>instructions</code></td>
            <td >
                Small Text</td>
@@ -1264,7 +1276,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>83</td>
+            <td>84</td>
            <td ><code>remarks</code></td>
            <td >
                Small Text</td>
@@ -1276,7 +1288,7 @@ Closed</pre>
        </tr>
        
        <tr class="info">
-            <td>84</td>
+            <td>85</td>
            <td ><code>transporter_info</code></td>
            <td >
                Section Break</td>
@@ -1290,7 +1302,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>85</td>
+            <td>86</td>
            <td ><code>transporter_name</code></td>
            <td >
                Data</td>
@@ -1302,7 +1314,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>86</td>
+            <td>87</td>
            <td ><code>column_break5</code></td>
            <td class="info">
                Column Break</td>
@@ -1314,7 +1326,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>87</td>
+            <td>88</td>
            <td ><code>lr_no</code></td>
            <td >
                Data</td>
@@ -1326,7 +1338,7 @@ Closed</pre>
        </tr>
        
        <tr >
-            <td>88</td>
+            <td>89</td>
            <td ><code>lr_date</code></td>
            <td >
                Date</td>
--- a/erpnext/docs/current/models/stock/serial_no.html
+++ b/erpnext/docs/current/models/stock/serial_no.html
@@ -353,17 +353,20 @@ Distinct unit of an Item
            <td>22</td>
            <td ><code>delivery_document_type</code></td>
            <td >
-                Select</td>
+                Link</td>
            <td >
                Delivery Document Type
                
            </td>
            <td>
-                <pre>
-Delivery Note
-Sales Invoice
-Stock Entry
-Purchase Receipt</pre>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
            </td>
        </tr>
        
@@ -371,12 +374,14 @@ Purchase Receipt</pre>
            <td>23</td>
            <td ><code>delivery_document_no</code></td>
            <td >
-                Data</td>
+                Dynamic Link</td>
            <td >
                Delivery Document No
                
            </td>
-            <td></td>
+            <td>
+                <pre>delivery_document_type</pre>
+            </td>
        </tr>
        
        <tr >
--- a/erpnext/docs/current/models/stock/warehouse.html
+++ b/erpnext/docs/current/models/stock/warehouse.html
@@ -629,8 +629,6 @@ A logical Warehouse against which stock entries are made.
 			
        
 			
-        
-			
            <li>


--- a/erpnext/docs/current/models/utilities/contact.html
+++ b/erpnext/docs/current/models/utilities/contact.html
@@ -588,6 +588,10 @@ Replied</pre>
 			
        
 			
+        
+			
+        
+			
            <li>


--- a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
+++ b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -8,11 +8,11 @@ Following are the steps to set language in your ERPNext account.

 #### 1.1 Go to My Setting

-![My Setting]({{docs_base_url}}/assets/img/articles/$SGrab_428.png)
+<img alt="My Setting" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-1.png">

 #### 1.2 Select Language

-![Select Language]({{docs_base_url}}/assets/img/articles/$SGrab_429.png)
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-2.png">

 #### 1.3 Save User

@@ -28,11 +28,11 @@ Being a System Manager, you can set language in other user's master as well.

 #### Set Language

-![Global Language]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png)
+<img alt="Global Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-3.png">

 #### Save

 Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.

-Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://frappe.io/translator).
+Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://translate.erpnext.com).
 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -1,17 +1,17 @@
-<h1>Change Password</h1>
+#Change User Password

 Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.


-####Step 1: Go to My Setting.
+####Step 1: Go to My Setting

-![Image]({{docs_base_url}}/assets/img/articles/SGrab_250.png)
+<img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-1.png">

-####Step 2: Set New Password.
+####Step 2: Set New Password

-![NEW]({{docs_base_url}}/assets/img/articles/Selection_014dd1559.png)
+<img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-2.png">

-Enter the new password and save the form to save changes. 
+Enter the new password and save the form to save changes.


 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -1,4 +1,4 @@
-<h1>Delete All Related Transactions for a Company</h1>
+#Delete All Related Transactions for a Company

 Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact.

@@ -12,8 +12,7 @@ In Company master, click on the **Delete Company Transactions** button right at

 This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful

-![Delete Company]({{docs_base_url}}/assets/img/articles/delete-company.png)
-
+<img alt="Delete Transactions" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-company.png">

 **Note:** If you want to delete the company record itself, the use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.

--- a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
@@ -1,28 +0,0 @@
-<h1>Edit Submitted Document</h1>
-
-&nbsp;To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
-<br>
-<br><b>Step 1: Cancel Submitted Document</b><br>
-<br>You will find Cancel button on upper right corner of submitted document.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_001.png">
-<br>
-<br><b>Step 2: Amend the document</b><br>
-<br>On cancellation of submitted document, <b>Amend</b> button will be became visible.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_00256341a.png">
-<br>
-<br><b>Step 3: Save and Submit the document</b><br>
-<br>On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
-<br>
-<br>
-<img src="{{docs_base_path}}/assets/img/articles/Selection_0036e00ef.png">
-<br>
-<br><div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. Example:<br><br>If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.<br>
-</div><br>
-<br>
-
-
-<!-- markdown -->
--- a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
@@ -0,0 +1,30 @@
+#Edit Submitted Document
+
+To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
+
+Step 1: Cancel Submitted Document
+
+You will find Cancel button on upper right corner of submitted document.
+
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-1.png">
+
+Step 2: Amend the document
+
+On cancellation of submitted document, Amend button will be became visible.
+
+<img alt="Amend Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-2.png">
+
+Step 3: Save and Submit the document
+
+On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
+
+<img alt="Resave and Submit Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-3.png">
+
+<div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. 
+	
+Example:If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.
+</div>
+
+
+
+<!-- markdown -->
--- 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
@@ -1,4 +1,4 @@
-<h1>Integrating ERPNext with other Applications</h1>
+#Integrating ERPNext with other Applications

 For now, ERPNext doesn't have out-of-the-box integration available for the third party applications. However, Frappe has REST API using which you can get ERPNext integrated with any other solution.

@@ -8,7 +8,7 @@ Learn more about Frappe API here.

 For experts services on integration, you can connect with our service providers from community portal.

-[https://frappe.io/community/service-providers](https://frappe.io/community/service-providers)
+[https://community.eprnext.com/service-providers](https://community.erpnext.com/service-providers)


 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
+++ b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
@@ -1,4 +0,0 @@
-<h1>Manage Header And Footer</h1>
-
-<h1>Manage Header And Footer</h1>
-
--- a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md
@@ -0,0 +1,9 @@
+#Manage Header And Footer
+
+Check following to learn how to setup Letter Head in ERPNext.
+
+[Managing Letter Head](https://frappe.github.io/erpnext/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.html)
+
+ERPNext doesn't have option to define standard Footer. As a work around, you can use Terms and Condition master for footer. Content of Terms and Condition is already the last to appear in the standard print formats on transactions. Check following link to learn how to manage Terms and Conditions in ERPNext.
+
+[Terms and Condition](https://frappe.github.io/erpnext/user/manual/en/setting-up/print/terms-and-conditions.html)
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -1,24 +1,22 @@
-<h1>Managing Multiple Companies</h1>
+#Managing Multiple Companies

-<h1>Managing Multiple Companies</h1>
+ERPNext allows you to create multiple companies in a single ERPNext instance.

-ERPNext allows you to create multiple companies in the same/common ERPNext account.
+In one account has multiple companies, you will find option to select Company in each transactions. While most of the records (mostly transactions) will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which are common among all the companies.

-With this, you will find option to select Company in your transactions. While most of the transactions will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which can be used across all the companies.
+If you have separate teams working on each company, you can restrict access of the User to the data of specific Company. Click [here](http://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/) to know how to set permission rules for giving restricted access to the User.

-If you have separate teams working on each company, you can also restrict the access of user to the data of specific company. Click [here](https://manual.erpnext.com/search?txt=user%20permission) to know more about how to set permission to achieve the same.
-
-Following are the steps to create companies in your ERPNext account.
+Following are the steps to add new Company.

 ####Go to Setup Module

-`Setup &gt; Masters &gt; Company &gt; New`
+`Accounts > Setup > Company > New`

 ####Enter Company Details

-Company master will be saved with Company Name provided at the time of its creation. 
+Company will be saved with Company Name provided.

-![New Company]({{docs_base_url}}/assets/img/articles/SGrab_343.png)
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-1.png">

 Also, you can define other properties for new company like:

@@ -30,13 +28,13 @@ Also, you can define other properties for new company like:

 Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement. 

-![New Company]({{docs_base_url}}/assets/img/articles/SGrab_344.png)
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-2.png">

 ####Chart of Account for New Company

 A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.

-![Company]({{docs_base_url}}/assets/img/articles/SGrab_342.png)
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-3.png">


 <!-- markdown -->
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -1,12 +1,10 @@
-<h1>Managing Perm Level in Permission Manager</h1>
-
-<h1>Managing Perm Level in Permission Manager</h1>
+#Managing Perm Level in Permission Manager

 In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.

-Perm Level for a field can be defined in the [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+Perm Level for a field can be defined in the [Customize Form](https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/customize-form.html).

-![Customize Form]({{docs_base_url}}/assets/img/articles/$SGrab_256.png)
+<img alt="Perm Level Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-1.gif">

 If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.

@@ -16,11 +14,11 @@ For the amount related fields, you should set Perm Level as (say) 2.

 For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.

-![Perm Level Manager]({{docs_base_url}}/assets/img/articles/$SGrab_253.png)
+<img alt="Perm Level Rule" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-2.png">

 Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.

-![Perm Level User]({{docs_base_url}}/assets/img/articles/$SGrab_254.png)
+<img alt="Perm Level Rule 2" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-3.png">

 Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.

--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -1,8 +1,6 @@
-<h1>Managing Tree Structure Masters</h1>
+#Managing Tree Structure Masters

-<h1>Managing Tree Structure Masters</h1>
-
-Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent masters, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. 
+Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set parent master, and child masters under those parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. 

 Following is the partial list of masters which are maintained in the tree structure.

@@ -26,7 +24,7 @@ Following are the steps to manage and create record in the tree structured maste

 Also you can type master name in Awesome Bar to go to the related master.

-Tree master allows you to set Parent Territories, and Child Territories Groups under those Parents.
+Tree master allows you to set parent Territories, and Child Territories Groups under those parents.

 ####Step 2 : New Parent Territory

--- a/erpnext/docs/user/videos/learn/index.md
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -223,8 +223,12 @@
        <li><a href="{{docs_base_url}}/user/videos/learn/publish-items-on-website.html">
            Publish Items on Website</a>
            <span class="text-muted pull-right">5:14</span>
+        </li><li><a href="{{docs_base_url}}/user/videos/learn/shopping-cart.html">
+            Shopping Cart</a>
+            <span class="text-muted pull-right">6:32</span>
        </li>
    </ul>
+	<br>
    <h3>Customization</h3>
    <ul class="list-unstyled video-list">
        <li><a href="{{docs_base_url}}/user/videos/learn/field-customization.html">
@@ -235,6 +239,10 @@
            Workflow</a>
            <span class="text-muted pull-right">3:38</span>
        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/report-builder.html">
+            Report Builder</a>
+            <span class="text-muted pull-right">4:27</span>
+        </li>
    </ul>
 </div>
 <div style="height: 70px;"></div>
--- a/erpnext/docs/user/videos/learn/index.txt
+++ b/erpnext/docs/user/videos/learn/index.txt
@@ -37,4 +37,6 @@ workflow
 advance-payments
 drop-ship
 file-manager
-publish-items-on-website
+publish-items-on-website
+shopping-cart
+report-builder
--- a/erpnext/docs/user/videos/learn/publish-items-on-website.md
+++ b/erpnext/docs/user/videos/learn/publish-items-on-website.md
@@ -1,4 +1,4 @@
-# Publish Item on Website
+# Publish Items on Website

 <iframe width="660" height="371" src="https://www.youtube.com/embed/W31LBBNzbgc" frameborder="0" allowfullscreen></iframe>

--- a/erpnext/docs/user/videos/learn/report-builder.md
+++ b/erpnext/docs/user/videos/learn/report-builder.md
@@ -0,0 +1,7 @@
+# Report Builder
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:27**
+
+This tutorial covers creating custom reports in ERPNext using Report Builder.
--- a/erpnext/docs/user/videos/learn/shopping-cart.md
+++ b/erpnext/docs/user/videos/learn/shopping-cart.md
@@ -0,0 +1,7 @@
+# Shopping Cart
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/xkrYO-KFukM" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 6:32**
+
+ERPNext has Customers Portal. It allos Customer to login, and place new orderes using shopping cart. From Customer Portal, customer can also track progress on their existing orders, view history of transactions and communicate via Issues.
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.13.1"
+app_version = "6.14.1"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -46,7 +46,7 @@ frappe.ui.form.on("Time Log", "before_save", function(frm) {
 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),
-		"minutes") / 60);
+		"seconds") / 3600);

 });

--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -101,3 +101,9 @@
  margin-right: 0px;
  margin-top: -3px;
 }
+.pos .discount-amount-area .discount-field-col {
+  padding-left: 0px;
+}
+.pos .discount-amount-area .input-group {
+  margin-top: 2px;
+}
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -865,12 +865,48 @@ frappe.ui.form.on(cur_frm.cscript.tax_table, "included_in_print_rate", function(
 })

 frappe.ui.form.on(cur_frm.doctype, "apply_discount_on", function(frm) {
-	cur_frm.cscript.calculate_taxes_and_totals();
+	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(!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) {
-	cur_frm.cscript.set_dynamic_labels();
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
+	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();
+});


--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -25,17 +25,25 @@
 						</div>
                    </div>
                    <div class="row pos-bill-row discount-amount-area">
-                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount Amount") %}</h6></div>
-                        <div class="col-xs-6"><input type="text" class="form-control discount-amount text-right"></div>
+                        <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 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 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>
                    </div>
-                    <!-- <div class="row pos-bill-row paid-amount-area">
-                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Amount Paid") %}</h6></div>
-                        <div class="col-xs-6"><input type="text" class="form-control paid-amount text-right"></div>
-                    </div> -->
    			</div>
    		</div>
    	</div>
--- a/erpnext/public/js/pos/pos.js
+++ b/erpnext/public/js/pos/pos.js
@@ -7,7 +7,7 @@ erpnext.pos.PointOfSale = Class.extend({
 	init: function(wrapper, frm) {
 		this.wrapper = wrapper;
 		this.frm = frm;
-		this.wrapper.html(frappe.render_template("pos", {}));
+		this.wrapper.html(frappe.render_template("pos", {currency: this.frm.currency}));

 		this.check_transaction_type();
 		this.make();
@@ -16,6 +16,11 @@ erpnext.pos.PointOfSale = Class.extend({
 		$(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));
@@ -230,6 +235,7 @@ erpnext.pos.PointOfSale = Class.extend({
 	},
 	refresh_fields: function() {
 		this.party_field.set_input(this.frm.doc[this.party.toLowerCase()]);
+		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();
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -125,3 +125,13 @@
 	margin-right: 0px;
 	margin-top: -3px;
 }
+
+.pos .discount-amount-area {
+	.discount-field-col {
+		padding-left: 0px;
+	}
+	
+	.input-group {
+		margin-top: 2px;
+	}
+}
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -25,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, 
@@ -46,6 +47,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -71,6 +73,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -96,6 +99,7 @@
   "options": "QTN-", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -122,6 +126,7 @@
   "options": "\nLead\nCustomer", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -148,6 +153,7 @@
   "options": "Customer", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -174,6 +180,7 @@
   "options": "Lead", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -196,6 +203,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -220,6 +228,7 @@
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -242,6 +251,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -264,6 +274,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -286,6 +297,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -308,6 +320,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -334,6 +347,7 @@
   "options": "Quotation", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -361,6 +375,7 @@
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -387,6 +402,7 @@
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -414,6 +430,7 @@
   "options": "\nSales\nMaintenance\nShopping Cart", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -437,6 +454,7 @@
   "options": "icon-tag", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -462,6 +480,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -489,6 +508,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -511,6 +531,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -537,6 +558,7 @@
   "options": "Price List", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -561,6 +583,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -585,6 +608,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -607,6 +631,7 @@
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -631,6 +656,7 @@
   "options": "icon-shopping-cart", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -656,6 +682,7 @@
   "options": "Quotation Item", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -678,6 +705,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -702,6 +730,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -727,6 +756,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, 
@@ -749,6 +779,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -773,6 +804,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -796,6 +828,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -820,6 +853,7 @@
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -845,6 +879,7 @@
   "options": "Sales Taxes and Charges Template", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -866,6 +901,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -890,6 +926,7 @@
   "options": "Shipping Rule", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -911,6 +948,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -936,6 +974,7 @@
   "options": "Sales Taxes and Charges", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -959,6 +998,7 @@
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -980,6 +1020,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1005,6 +1046,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, 
@@ -1026,6 +1068,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1049,6 +1092,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1073,6 +1117,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1098,51 +1143,7 @@
   "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": "column_break_46", 
-   "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": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1167,6 +1168,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1174,6 +1176,77 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_46", 
+   "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": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1191,6 +1264,7 @@
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1216,6 +1290,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, 
@@ -1242,6 +1317,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, 
@@ -1268,6 +1344,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1291,6 +1368,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1317,6 +1395,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1343,6 +1422,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1368,6 +1448,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1394,6 +1475,7 @@
   "options": "icon-legal", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1419,6 +1501,7 @@
   "options": "Terms and Conditions", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -1443,6 +1526,7 @@
   "oldfieldtype": "Text Editor", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1466,6 +1550,7 @@
   "options": "icon-bullhorn", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1490,6 +1575,7 @@
   "options": "Territory", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1517,6 +1603,7 @@
   "options": "Customer Group", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1540,6 +1627,7 @@
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1562,6 +1650,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1584,6 +1673,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1608,6 +1698,7 @@
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1634,6 +1725,7 @@
   "options": "Contact", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1657,6 +1749,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1682,6 +1775,7 @@
   "options": "Letter Head", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1707,6 +1801,7 @@
   "options": "Print Heading", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -1731,6 +1826,7 @@
   "options": "icon-file-text", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1756,6 +1852,7 @@
   "options": "Campaign", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1781,6 +1878,7 @@
   "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1806,6 +1904,7 @@
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1828,6 +1927,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1855,6 +1955,7 @@
   "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1880,6 +1981,7 @@
   "options": "Fiscal Year", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1904,6 +2006,7 @@
   "oldfieldtype": "Text", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1922,7 +2025,8 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 1, 
- "modified": "2015-11-16 06:29:54.958329", 
+ "menu_index": 0, 
+ "modified": "2015-12-17 16:19:06.964646", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Quotation", 
@@ -2119,5 +2223,6 @@
 "search_fields": "status,transaction_date,customer,lead,order_type", 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -25,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, 
@@ -47,6 +48,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -72,6 +74,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -97,6 +100,7 @@
   "options": "SO-", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -122,6 +126,7 @@
   "options": "Customer", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -144,6 +149,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -166,6 +172,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -188,6 +195,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -210,6 +218,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -232,6 +241,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -259,6 +269,7 @@
   "options": "\nSales\nMaintenance\nShopping Cart", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -281,6 +292,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -307,6 +319,7 @@
   "options": "Sales Order", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -334,6 +347,7 @@
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -360,6 +374,7 @@
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -386,6 +401,7 @@
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -413,6 +429,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -440,6 +457,7 @@
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -464,6 +482,7 @@
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -486,6 +505,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -509,6 +529,7 @@
   "options": "icon-tag", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -534,6 +555,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -561,6 +583,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -583,6 +606,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -609,6 +633,7 @@
   "options": "Price List", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -633,6 +658,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -657,6 +683,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -679,6 +706,7 @@
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -703,6 +731,7 @@
   "options": "icon-shopping-cart", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -728,6 +757,7 @@
   "options": "Sales Order Item", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -749,6 +779,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -770,6 +801,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -794,6 +826,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -819,6 +852,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, 
@@ -841,6 +875,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -865,6 +900,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -888,6 +924,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -912,6 +949,7 @@
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -937,6 +975,7 @@
   "options": "Sales Taxes and Charges Template", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -958,6 +997,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -982,6 +1022,7 @@
   "options": "Shipping Rule", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1003,6 +1044,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1028,6 +1070,7 @@
   "options": "Sales Taxes and Charges", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1051,6 +1094,7 @@
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1072,6 +1116,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1097,6 +1142,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, 
@@ -1120,6 +1166,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1143,6 +1190,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1167,6 +1215,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1192,50 +1241,7 @@
   "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": "column_break_50", 
-   "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": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1260,6 +1266,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1267,6 +1274,78 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_50", 
+   "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": "", 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1284,6 +1363,7 @@
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1309,6 +1389,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, 
@@ -1335,6 +1416,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, 
@@ -1361,6 +1443,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1384,6 +1467,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1410,6 +1494,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1436,6 +1521,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1461,6 +1547,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1485,6 +1572,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, 
@@ -1511,6 +1599,7 @@
   "options": "icon-suitcase", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1536,6 +1625,7 @@
   "options": "Packed Item", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1561,6 +1651,7 @@
   "options": "icon-legal", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1586,6 +1677,7 @@
   "options": "Terms and Conditions", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1610,6 +1702,7 @@
   "oldfieldtype": "Text Editor", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1634,6 +1727,7 @@
   "options": "icon-bullhorn", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1655,6 +1749,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1680,6 +1775,7 @@
   "options": "Territory", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1704,6 +1800,7 @@
   "options": "Customer Group", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1725,6 +1822,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1749,6 +1847,7 @@
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1772,6 +1871,7 @@
   "options": "Contact", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1797,6 +1897,7 @@
   "options": "icon-file-text", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1823,6 +1924,7 @@
   "options": "Project", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1848,6 +1950,7 @@
   "options": "Fiscal Year", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1871,6 +1974,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1896,6 +2000,7 @@
   "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1922,6 +2027,7 @@
   "options": "Campaign", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1945,6 +2051,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1970,6 +2077,7 @@
   "options": "Letter Head", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1992,6 +2100,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2018,6 +2127,7 @@
   "options": "Print Heading", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -2041,6 +2151,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2068,6 +2179,7 @@
   "options": "\nDraft\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nStopped\nCancelled\nClosed", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -2092,6 +2204,7 @@
   "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2118,6 +2231,7 @@
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2140,6 +2254,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2166,6 +2281,7 @@
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2190,6 +2306,7 @@
   "options": "Not Billed\nFully Billed\nPartly Billed\nClosed", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2215,6 +2332,7 @@
   "options": "icon-group", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2240,6 +2358,7 @@
   "options": "Sales Partner", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2262,6 +2381,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2287,6 +2407,7 @@
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2313,6 +2434,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, 
@@ -2336,6 +2458,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2361,6 +2484,7 @@
   "options": "Sales Team", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2385,6 +2509,7 @@
   "options": "icon-time", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2409,6 +2534,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2434,6 +2560,7 @@
   "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2458,6 +2585,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2482,6 +2610,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2506,6 +2635,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2530,6 +2660,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2552,6 +2683,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2576,6 +2708,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2599,6 +2732,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2623,6 +2757,7 @@
   "no_copy": 1, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2648,6 +2783,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2666,7 +2802,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:56.599677", 
+ "modified": "2015-12-17 16:19:40.324514", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Sales Order", 
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -155,7 +155,7 @@ erpnext.SalesChart = Class.extend({
 						if(node.expanded) {
 							node.toggle_node();
 						}
-						node.reload_parent();
+						node.reload();
 					}
 				}
 			});
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -25,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, 
@@ -47,6 +48,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -73,6 +75,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -98,6 +101,7 @@
   "options": "DN-\nDN-RET-", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -123,6 +127,7 @@
   "options": "Customer", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -146,6 +151,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -170,6 +176,7 @@
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -192,6 +199,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -215,6 +223,7 @@
   "options": "Address", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -237,6 +246,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -259,6 +269,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -281,6 +292,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -303,6 +315,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -325,6 +338,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -350,6 +364,7 @@
   "options": "Delivery Note", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -378,6 +393,7 @@
   "options": "Company", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -405,6 +421,7 @@
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -431,6 +448,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -458,6 +476,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -483,6 +502,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -508,6 +528,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -531,6 +552,7 @@
   "options": "icon-tag", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -556,6 +578,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -582,6 +605,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -603,6 +627,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -628,6 +653,7 @@
   "options": "Price List", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -651,6 +677,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -675,6 +702,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -697,6 +725,7 @@
   "no_copy": 1, 
   "permlevel": 1, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -721,6 +750,7 @@
   "options": "icon-shopping-cart", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -746,6 +776,7 @@
   "options": "Delivery Note Item", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -771,6 +802,7 @@
   "options": "icon-suitcase", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -796,6 +828,7 @@
   "options": "Packed Item", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -818,6 +851,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -839,6 +873,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -863,6 +898,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -888,6 +924,7 @@
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -911,6 +948,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -935,6 +973,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -958,6 +997,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -982,6 +1022,7 @@
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1008,6 +1049,7 @@
   "options": "Sales Taxes and Charges Template", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1029,6 +1071,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1053,6 +1096,7 @@
   "options": "Shipping Rule", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1074,6 +1118,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1099,6 +1144,7 @@
   "options": "Sales Taxes and Charges", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1122,6 +1168,7 @@
   "oldfieldtype": "HTML", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1143,6 +1190,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1168,6 +1216,7 @@
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1192,6 +1241,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1215,6 +1265,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1239,6 +1290,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1264,50 +1316,7 @@
   "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": "column_break_51", 
-   "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": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1332,6 +1341,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1339,6 +1349,76 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_51", 
+   "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": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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": "discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1356,6 +1436,7 @@
   "options": "icon-money", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1381,6 +1462,7 @@
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1408,6 +1490,7 @@
   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1435,6 +1518,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "200px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1459,6 +1543,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1484,6 +1569,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1511,6 +1597,7 @@
   "options": "currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1538,6 +1625,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -1565,6 +1653,7 @@
   "options": "icon-legal", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1590,6 +1679,7 @@
   "options": "Terms and Conditions", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1614,6 +1704,7 @@
   "oldfieldtype": "Text Editor", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1638,6 +1729,7 @@
   "options": "icon-truck", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1662,6 +1754,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -1685,6 +1778,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -1712,6 +1806,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -1740,6 +1835,7 @@
   "oldfieldtype": "Date", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -1766,6 +1862,7 @@
   "options": "icon-bullhorn", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1790,6 +1887,7 @@
   "options": "Territory", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -1814,6 +1912,7 @@
   "options": "Customer Group", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1835,6 +1934,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -1860,6 +1960,7 @@
   "options": "Contact", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1884,6 +1985,7 @@
   "options": "icon-file-text", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1910,6 +2012,7 @@
   "options": "Project", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1936,6 +2039,7 @@
   "options": "Campaign", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1961,6 +2065,7 @@
   "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -1983,6 +2088,7 @@
   "oldfieldtype": "Column Break", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2010,6 +2116,7 @@
   "oldfieldtype": "Time", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2037,6 +2144,7 @@
   "options": "Fiscal Year", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2062,6 +2170,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2087,6 +2196,7 @@
   "options": "Letter Head", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2112,6 +2222,7 @@
   "options": "Print Heading", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 1, 
   "reqd": 0, 
@@ -2134,6 +2245,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2158,6 +2270,7 @@
   "oldfieldtype": "Check", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2180,6 +2293,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2206,6 +2320,7 @@
   "options": "\nDraft\nSubmitted\nCancelled\nClosed", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 1, 
   "report_hide": 0, 
@@ -2234,6 +2349,7 @@
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2256,6 +2372,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2277,6 +2394,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2303,6 +2421,7 @@
   "options": "Warehouse", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2327,6 +2446,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2351,6 +2471,7 @@
   "oldfieldtype": "Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2376,6 +2497,7 @@
   "options": "icon-group", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2401,6 +2523,7 @@
   "options": "Sales Partner", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "150px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2424,6 +2547,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "50%", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2450,6 +2574,7 @@
   "oldfieldtype": "Currency", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "print_width": "100px", 
   "read_only": 0, 
   "report_hide": 0, 
@@ -2477,6 +2602,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, 
@@ -2500,6 +2626,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2525,6 +2652,7 @@
   "options": "Sales Team", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -2543,7 +2671,8 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:44.673451", 
+ "menu_index": 0, 
+ "modified": "2015-12-17 16:19:27.004718", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Delivery Note", 
@@ -2675,5 +2804,6 @@
 "search_fields": "status,customer,customer_name, territory,base_grand_total", 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -541,7 +541,8 @@ class Item(WebsiteGenerator):
 		if self.variant_of:
 			template_uom = frappe.db.get_value("Item", self.variant_of, "stock_uom")
 			if template_uom != self.stock_uom:
-				frappe.throw(_("Default Unit of Measure for Variant must be same as Template"))
+				frappe.throw(_("Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'")
+					.format(self.stock_uom, template_uom))

 	def validate_attributes(self):
 		if self.has_variants or self.variant_of:
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -39,24 +39,23 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
 					this.make_supplier_quotation,
 						frappe.boot.doctype_icons["Supplier Quotation"]);

-			if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted")
-				cur_frm.add_custom_button(__("Transfer Material"), this.make_stock_entry,
-					frappe.boot.doctype_icons["Stock Entry"]);
-
-			if(doc.material_request_type === "Material Issue" && doc.status === "Submitted")
-				cur_frm.add_custom_button(__("Issue Material"), this.make_stock_entry,
-					frappe.boot.doctype_icons["Stock Entry"]);
-
 			if(flt(doc.per_ordered, 2) < 100) {
+				if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted")
+					cur_frm.add_custom_button(__("Transfer Material"), this.make_stock_entry,
+						frappe.boot.doctype_icons["Stock Entry"]);
+
+				if(doc.material_request_type === "Material Issue" && doc.status === "Submitted")
+					cur_frm.add_custom_button(__("Issue Material"), this.make_stock_entry,
+						frappe.boot.doctype_icons["Stock Entry"]);
+
 				if(doc.material_request_type === "Purchase")
 					cur_frm.add_custom_button(__('Make Purchase Order'),
 						this.make_purchase_order, frappe.boot.doctype_icons["Purchase Order"]);

 				cur_frm.add_custom_button(__('Stop'),
 					cur_frm.cscript['Stop Material Request'], "icon-exclamation", "btn-default");
+
 			}
-
-
 		}

 		if (this.frm.doc.docstatus===0) {
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -123,6 +123,10 @@ class MaterialRequest(BuyingController):
 					from `tabStock Entry Detail` where material_request = %s
 					and material_request_item = %s and docstatus = 1""",
 					(self.name, d.name))[0][0])
+
+				if d.ordered_qty and d.ordered_qty > d.qty:
+					frappe.throw(_("The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3}").format(d.ordered_qty, d.parent, d.qty, d.item_code))
+
 				frappe.db.set_value(d.doctype, d.name, "ordered_qty", d.ordered_qty)

 			# note: if qty is 0, its row is still counted in len(self.get("items"))
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -276,8 +276,8 @@ class TestMaterialRequest(unittest.TestCase):
 			"fiscal_year": "_Test Fiscal Year 2013",
 		})
 		se_doc.get("items")[0].update({
-			"qty": 60.0,
-			"transfer_qty": 60.0,
+			"qty": 54.0,
+			"transfer_qty": 54.0,
 			"s_warehouse": "_Test Warehouse 1 - _TC",
 			"basic_rate": 1.0
 		})
@@ -307,7 +307,7 @@ class TestMaterialRequest(unittest.TestCase):
 		mr.load_from_db()

 		self.assertEquals(mr.per_ordered, 100)
-		self.assertEquals(mr.get("items")[0].ordered_qty, 60.0)
+		self.assertEquals(mr.get("items")[0].ordered_qty, 54.0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 3.0)

 		current_requested_qty_item1 = self._get_requested_qty("_Test Item Home Desktop 100", "_Test Warehouse - _TC")
@@ -383,7 +383,7 @@ class TestMaterialRequest(unittest.TestCase):
 	def _get_requested_qty(self, item_code, warehouse):
 		return flt(frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "indented_qty"))

-	def test_make_stock_entry_for_Material_Issue(self):
+	def test_make_stock_entry_for_material_issue(self):
 		from erpnext.stock.doctype.material_request.material_request import make_stock_entry

 		mr = frappe.copy_doc(test_records[0]).insert()
@@ -422,13 +422,13 @@ class TestMaterialRequest(unittest.TestCase):

 		se_doc = make_stock_entry(mr.name)
 		se_doc.fiscal_year = "_Test Fiscal Year 2014"
-		se_doc.get("items")[0].qty = 60.0
+		se_doc.get("items")[0].qty = 54.0
 		se_doc.insert()
 		se_doc.submit()

 		# check if per complete is as expected
 		mr.load_from_db()
-		self.assertEquals(mr.get("items")[0].ordered_qty, 60.0)
+		self.assertEquals(mr.get("items")[0].ordered_qty, 54.0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 3.0)

 		#testing bin requested qty after issuing stock against material request
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1167,6 +1167,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -1190,6 +1215,30 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "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, 
@@ -1215,31 +1264,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -2254,7 +2278,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2015-12-01 00:48:26.728603", 
+ "modified": "2015-12-17 16:18:48.969643", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Purchase Receipt", 
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -360,7 +360,7 @@ def get_projected_qty(item_code, warehouse):
@frappe.whitelist()
 def get_available_qty(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", "actual_qty"], as_dict=True) or {"projected_qty": 0, "actual_qty": 0}

@frappe.whitelist()
 def get_batch_qty(batch_no,warehouse,item_code):
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -13,7 +13,7 @@ DocType: Item,Publish Item to hub.erpnext.com,نشر البند إلى hub.erpne
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,إشعارات البريد الإلكتروني
 DocType: Item,Default Unit of Measure,وحدة القياس الافتراضية
 DocType: SMS Center,All Sales Partner Contact,جميع مبيعات الاتصال الشريك
-DocType: Employee,Leave Approvers,ترك الموافقون
+DocType: Employee,Leave Approvers,الموافقون علي الاجازة
 DocType: Sales Partner,Dealer,تاجر
 DocType: Employee,Rented,مؤجر
 DocType: POS Profile,Applicable for User,ينطبق على العضو
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
 DocType: Purchase Order,Customer Contact,العملاء الاتصال
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,من المواد طلب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,من المواد طلب
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} شجرة
 DocType: Job Applicant,Job Applicant,طالب العمل
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ال
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. للحفاظ على العملاء رمز البند الحكيمة والبحث فيها لجعلها تقوم على التعليمات البرمجية الخاصة بهم استخدام هذا الخيار
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,مشاهدة المتغيرات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,كمية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),القروض ( المطلوبات )
 DocType: Employee Education,Year of Passing,اجتياز سنة
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,في الأوراق المالية
@@ -63,7 +63,7 @@ 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 +606,Invoice,فاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,عنوان البريد الإلكتروني
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,الصف # {0}
 DocType: Delivery Note,Vehicle No,السيارة لا
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,الرجاء اختيار قائمة الأسعار
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,الرجاء اختيار قائمة الأسعار
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
 DocType: Employee,Holiday List,عطلة قائمة
 DocType: Time Log,Time Log,وقت دخول
@@ -197,7 +197,7 @@ DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,تعيين كافتراضي
 ,Purchase Order Trends,شراء اتجاهات ترتيب
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,تخصيص الأوراق لهذا العام.
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,تخصيص الاجازات لهذا العام.
 DocType: Earning Type,Earning Type,كسب نوع
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,تعطيل تخطيط القدرات وتتبع الوقت
 DocType: Bank Reconciliation,Bank Account,الحساب المصرفي
@@ -215,8 +215,9 @@ DocType: Sales Partner,Reseller,بائع التجزئة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,يرجى إدخال الشركة
 DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
+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,إضافة الأوراق غير المستخدمة من المخصصات السابقة
+DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الاجازات غير المستخدمة من المخصصات السابقة
 apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
 DocType: Newsletter List,Total Subscribers,إجمالي عدد المشتركين
 ,Contact Name,اسم جهة الاتصال
@@ -233,7 +234,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 DocType: Payment Tool,Reference No,المرجع لا
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -245,7 +246,7 @@ DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,البند {0} تم إلغاء
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
@@ -305,10 +306,10 @@ apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/custome
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
 apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
 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: 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 +628,Select Item,اختر البند
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
 المالية المصالحة، بدلا من استخدام الدخول المالية"
@@ -330,14 +331,14 @@ DocType: Quality Inspection,Inspected By,تفتيش من قبل
 DocType: Maintenance Visit,Maintenance Type,صيانة نوع
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,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,ترك اسم الموافق
+DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
 ,Schedule Date,جدول التسجيل
 DocType: Packed Item,Packed Item,ملاحظة التوصيل التغليف
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,الإعدادات الافتراضية ل شراء صفقة.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},وجود النشاط التكلفة للموظف {0} ضد نوع النشاط - {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,يرجى عدم إنشاء حسابات العملاء والموردين. يتم إنشاؤها مباشرة من سادة العملاء / الموردين.
 DocType: Currency Exchange,Currency Exchange,تحويل العملات
-DocType: Purchase Invoice Item,Item Name,البند الاسم
+DocType: 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,ارمل
@@ -382,13 +383,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,مدير المب
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,الإعدادات العمومية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتي
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +554,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,عطلة الرئيسي.
 DocType: Material Request Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,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,إجمالي الكمية
@@ -491,7 +492,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,العملاء قاع
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,المتوسطة الدخل
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.,مستودع المنطقي الذي ضد مصنوعة إدخالات الأسهم.
@@ -519,9 +520,10 @@ DocType: Buying Settings,Supplier Naming By,المورد تسمية بواسطة
 DocType: Activity Type,Default Costing Rate,افتراضي تكلف سعر
 DocType: Maintenance Schedule,Maintenance Schedule,صيانة جدول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيتها من قوانين التسعير على أساس العملاء، مجموعة العملاء، الأرض، مورد، مورد نوع، حملة، شريك المبيعات الخ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,صافي التغير في المخزون
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدير
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,من إيصال الشراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,من إيصال الشراء
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
 DocType: SMS Settings,Receiver Parameter,استقبال معلمة
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
@@ -800,7 +802,8 @@ 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 +626,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
@@ -821,7 +824,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع الرصاص (فتح)
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,إرفاق صورتك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,جعل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Make ,جعل
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,سلتي
@@ -832,8 +835,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 +181,Qty for {0},الكمية ل{0}
-DocType: Leave Application,Leave Application,ترك التطبيق
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ترك أداة تخصيص
+DocType: Leave Application,Leave Application,طلب اجازة
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,اداة توزيع الاجازات
 DocType: Leave Block List,Leave Block List Dates,ترك التواريخ قائمة الحظر
 DocType: Company,If Monthly Budget Exceeded (for expense account),إذا تجاوز الميزانية الشهرية (لحساب المصاريف)
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
@@ -843,10 +846,10 @@ DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زل
 DocType: POS Profile,Cash/Bank Account,النقد / البنك حساب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,خصم
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,خصم
 DocType: Features Setup,Purchase Discounts,شراء خصومات
 DocType: Workstation,Wages,أجور
 DocType: Time Log,Will be updated only if Time Log is 'Billable',وسيتم تحديث إلا إذا وقت الدخول هو &quot;فوترة&quot;
@@ -913,6 +916,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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.,حدد وقت السجلات وتقديمها إلى إنشاء فاتورة مبيعات جديدة.
@@ -1000,7 +1004,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,افتتاح مؤقت
-,Employee Leave Balance,الموظف اترك الرصيد
+,Employee Leave Balance,رصيد اجازات الموظف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
 DocType: Address,Address Type,نوع العنوان
 DocType: Purchase Receipt,Rejected Warehouse,رفض مستودع
@@ -1053,7 +1057,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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,مجموع المنتهية ولايته
@@ -1093,7 +1097,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع قيمة الطلب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,غذاء
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,المدى شيخوخة 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد نظام إنتاج المقدمة
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد أمر إنتاج مسجل
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",النشرات الإخبارية إلى جهات الاتصال، ويؤدي.
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},يجب أن تكون عملة الحساب الختامي {0}
@@ -1107,7 +1111,7 @@ DocType: Purchase Invoice Item,Accounting,المحاسبة
 DocType: Features Setup,Features Setup,ميزات الإعداد
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,مشاهدة خطاب العرض
 DocType: Item,Is Service Item,هو البند خدمة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,فترة التطبيق لا يمكن أن يكون تخصيص فترة إجازة الخارجي
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن يكون خارج فترةالاجزات المخصصة
 DocType: Activity Cost,Projects,مشاريع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,الرجاء اختيار السنة المالية
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},من {0} | {1} {2}
@@ -1125,6 +1129,7 @@ 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 +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},الحد الأقصى: {0}
@@ -1136,7 +1141,7 @@ DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاس
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1185,7 +1190,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,محلل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
 DocType: Item,Inventory,جرد
 DocType: Features Setup,"To enable ""Point of Sale"" view",لتمكين &quot;نقطة البيع&quot; وجهة نظر
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
+apps/erpnext/erpnext/public/js/pos/pos.js +408,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,في الكمية
@@ -1204,6 +1209,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,تاريخ بدء السنة المالية
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+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,الشحن و التخليص الرسوم
 DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا
 DocType: Item Group,Item Group Name,البند اسم المجموعة
@@ -1216,7 +1222,7 @@ DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),إضافي مقدار الخصم (العملة الشركة)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},الخطأ: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},الخطأ: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,يرجى إنشاء حساب جديد من الرسم البياني للحسابات .
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,العملاء> مجموعة العملاء> إقليم
@@ -1266,7 +1272,7 @@ DocType: Production Planning Tool,Select Sales Orders,حدد أوامر المب
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (ق) الذي يتم تطبيق للحصول على إجازة وأيام العطل. لا تحتاج إلى تقديم طلب للحصول الإجازة.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,لتعقب العناصر باستخدام الباركود. سوف تكون قادرة على الدخول في بنود مذكرة التسليم والفاتورة المبيعات عن طريق مسح الباركود من العنصر.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,إجعلها تسليم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,إجعلها تسليم
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,جعل الاقتباس
 DocType: Dependent Task,Dependent Task,العمل تعتمد
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
@@ -1276,7 +1282,8 @@ DocType: HR Settings,Stop Birthday Reminders,توقف عيد ميلاد تذكي
 DocType: SMS Center,Receiver List,استقبال قائمة
 DocType: Payment Tool Detail,Payment Amount,دفع مبلغ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} مشاهدة
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} مشاهدة
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,صافي التغير في النقد
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
@@ -1313,6 +1320,7 @@ DocType: Payment Reconciliation,Payments,المدفوعات
 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 +53,Update bank payment dates with journals.,تحديث البنك دفع التواريخ مع المجلات.
@@ -1348,7 +1356,7 @@ apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
 apps/erpnext/erpnext/stock/doctype/item/item.js +200,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لجعل هذا المقال الاوراق المالية
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,واحد وحدة من عنصر.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +213,Time Log Batch {0} must be 'Submitted',وقت دخول الدفعة {0} يجب ' نشره '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
@@ -1360,7 +1368,7 @@ DocType: Upload Attendance,Get Template,الحصول على قالب
 DocType: Address,Postal,بريدي
 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 +147,Please select {0} first.,الرجاء اختيار {0} أولا.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,الرجاء اختيار {0} أولا.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},النص {0}
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
@@ -1394,7 +1402,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,ترك صرفها؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,جعل أمر الشراء
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,جعل أمر الشراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1416,10 +1424,10 @@ DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: GL Entry,Credit Amount in Account Currency,مبلغ القرض في حساب العملات
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,سجلات الوقت للتصنيع.
 DocType: Item,Apply Warehouse-wise Reorder Level,تطبيق مستودع الحكمة إعادة ترتيب مستوى
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} يجب أن تقدم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,وقت دخول للمهام.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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,تحية
@@ -1446,7 +1454,7 @@ DocType: Packing Slip,Indicates that the package is a part of this delivery (Onl
 DocType: Payment Tool,Make Payment Entry,جعل الدفع الاشتراك
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
 ,Sales Invoice Trends,اتجاهات فاتورة المبيعات
-DocType: Leave Application,Apply / Approve Leaves,تطبيق / الموافقة على أوراق
+DocType: Leave Application,Apply / Approve Leaves,تقديم / الموافقة على أجازة
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"يمكن الرجوع صف فقط إذا كان نوع التهمة هي "" في السابق المبلغ صف 'أو' السابق صف إجمالي '"
 DocType: Sales Order Item,Delivery Warehouse,مستودع تسليم
@@ -1527,7 +1535,7 @@ DocType: Appraisal,For Employee Name,لاسم الموظف
 DocType: Holiday List,Clear Table,الجدول واضح
 DocType: Features Setup,Brands,العلامات التجارية
 DocType: C-Form Invoice Detail,Invoice No,الفاتورة لا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,من أمر الشراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,من أمر الشراء
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,العناوين العملاء واتصالات
@@ -1731,7 +1739,7 @@ apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and m
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,كود البند> مجموعة المدينة> العلامة التجارية
 DocType: Appraisal Goal,Appraisal Goal,تقييم الهدف
 DocType: Time Log,Costing Amount,تكلف مبلغ
-DocType: Process Payroll,Submit Salary Slip,يقدم زلة الراتب
+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}%,خصم Maxiumm القطعة ل {0} {1} ٪
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,استيراد بكميات كبيرة
@@ -1767,13 +1775,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,نقل المواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,تسمح الأسهم السلبية
 DocType: Installation Note,Installation Note,ملاحظة التثبيت
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,إضافة الضرائب
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,تدفق النقد من التمويل
 ,Financial Analytics,تحليلات مالية
 DocType: Quality Inspection,Verified By,التحقق من
 DocType: Address,Subsidiary,شركة فرعية
@@ -1816,6 +1825,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Tool,Payment Account,حساب الدفع
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/erpnext/erpnext/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
@@ -1920,7 +1930,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 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 +477,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
@@ -2030,7 +2040,7 @@ DocType: Bank Reconciliation Detail,Cheque Number,عدد الشيكات
 DocType: Payment Tool Detail,Payment Tool Detail,دفع أداة التفاصيل
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,محلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,المدينين
@@ -2148,7 +2158,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},مستودع الهدف هو إلزامية ل صف {0}
 DocType: Quality Inspection,Quality Inspection,فحص الجودة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} مجمد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
@@ -2200,7 +2210,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,حساب الموافق
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,دفع
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,دفع
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,إلى التاريخ والوقت
 DocType: SMS Settings,SMS Gateway URL,SMS بوابة URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
@@ -2237,7 +2247,7 @@ DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
 apps/erpnext/erpnext/hooks.py +54,Orders,أوامر
 DocType: Leave Control Panel,Employee Type,نوع الموظف
-DocType: Employee Leave Approver,Leave Approver,ترك الموافق
+DocType: Employee Leave Approver,Leave Approver,الموافق علي الاجازة
 DocType: Manufacturing Settings,Material Transferred for Manufacture,المواد المنقولة لغرض صناعة
 DocType: Expense Claim,"A user with ""Expense Approver"" role","يمكن للمستخدم مع ""النفقات الموافق"" دور"
 ,Issued Items Against Production Order,الأصناف التي صدرت بحق أمر الإنتاج
@@ -2247,12 +2257,12 @@ DocType: Target Detail,Target Detail,الهدف التفاصيل
 DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد فوترت مقابل أمر المبيعات
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,بدء فترة الإغلاق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
+DocType: Account,Depreciation,خفض
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
 DocType: Customer,Credit Limit,الحد الائتماني
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
 DocType: GL Entry,Voucher No,رقم السند
-DocType: Leave Allocation,Leave Allocation,ترك توزيع
+DocType: Leave Allocation,Leave Allocation,توزيع الاجازات
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,طلبات المواد {0} خلق
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,قالب من الشروط أو العقد.
 DocType: Customer,Address and Contact,عنوان والاتصال
@@ -2272,6 +2282,7 @@ DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
 DocType: Delivery Note,Track this Delivery Note against any Project,تتبع هذه ملاحظة التوصيل ضد أي مشروع
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,صافي النقد من الاستثمار
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,لا يمكن حذف حساب الجذر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,مشاهدة سهم مقالات
 ,Is Primary Address,هو العنوان الرئيسي
@@ -2341,7 +2352,8 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 DocType: Appraisal,Appraisal,تقييم
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ويتكرر التاريخ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,المفوض بالتوقيع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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,بداية
@@ -2392,7 +2404,7 @@ apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,تؤدي إلى الا
 DocType: Lead,From Customer,من العملاء
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,المكالمات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
-DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
+DocType: Purchase Order Item Supplied,Stock UOM,الوحدة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,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}
@@ -2409,9 +2421,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,التكلفة هبط
 DocType: Time Log,Batched for Billing,دفعات عن الفواتير
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,رفعت فواتير من قبل الموردين.
 DocType: POS Profile,Write Off Account,شطب حساب
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,خصم المبلغ
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,صافي التدفقات النقدية من العمليات
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,على سبيل المثال ضريبة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
@@ -2423,7 +2435,7 @@ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Com
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",انتقل إلى المجموعة المناسبة (عادة مصدر الأموال&gt; المطلوبات المتداولة&gt; الضرائب والرسوم وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;الضريبة&quot; والقيام نذكر معدل الضريبة.
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
-DocType: Journal Entry,Stock Entry,الأسهم الدخول
+DocType: Journal Entry,Stock Entry,حركة مخزنية
 DocType: Account,Payable,المستحقة
 DocType: Salary Slip,Arrear Amount,متأخرات المبلغ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,زبائن الجدد
@@ -2479,7 +2491,7 @@ DocType: Expense Claim,Task,مهمة
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع صف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},رقم الباتش إلزامي للصنف{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
-,Stock Ledger,الأسهم ليدجر
+,Stock Ledger,سجل المخزن
 apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},معدل: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,حدد عقدة المجموعة أولا.
@@ -2487,7 +2499,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must b
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,تعبئة النموذج وحفظه
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,تحميل تقريرا يتضمن جميع المواد الخام مع وضعهم أحدث المخزون
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,منتديات
-DocType: Leave Application,Leave Balance Before Application,ترك الرصيد قبل تطبيق
+DocType: Leave Application,Leave Balance Before Application,رصيد الاجازات قلب الطلب
 DocType: SMS Center,Send SMS,إرسال SMS
 DocType: Company,Default Letter Head,افتراضي رسالة رئيس
 DocType: Time Log,Billable,فوترة
@@ -2587,7 +2599,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 الصراع عن طريق تعيين الأولوية. قواعد السعر: {0}"
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,عرض التسجيل
 DocType: Hub Settings,Access Token,رمز وصول
@@ -2607,6 +2619,7 @@ DocType: Purchase Invoice Item,Image View,عرض الصورة
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
+apps/erpnext/erpnext/stock/doctype/item/item.py +544,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,التقييم وتوتال
@@ -2614,6 +2627,7 @@ DocType: Tax Rule,Shipping City,الشحن سيتي
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"هذا البند هو البديل من {0} (قالب). سيتم نسخ سمات على من القالب ما لم يتم تعيين ""لا نسخ '"
 DocType: Account,Purchase User,شراء العضو
 DocType: Notification Control,Customize the Notification,تخصيص إعلام
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,التدفق النقدي من العمليات
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
 DocType: Sales Invoice,Shipping Rule,الشحن القاعدة
 DocType: Journal Entry,Print Heading,طباعة عنوان
@@ -2655,7 +2669,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ساعة
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
 باستخدام الأسهم المصالحة"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,نقل المواد إلى المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,نقل المواد إلى المورد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,إنشاء اقتباس
@@ -2667,7 +2681,7 @@ 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/purchase_invoice/purchase_invoice.js +438,From Product Bundle,من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,من حزمة المنتج
 DocType: Production Planning Tool,Production Planning Tool,إنتاج أداة تخطيط المنزل
 DocType: Quality Inspection,Report Date,تقرير تاريخ
 DocType: C-Form,Invoices,الفواتير
@@ -2682,6 +2696,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,مجموعة العملاء
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,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 تاريخ انتهاء الاشتراك
 ,Sales Register,سجل مبيعات
 DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
@@ -2693,7 +2708,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 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 +485,Get Items,الحصول على العناصر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,الحصول على العناصر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,أمر آخر تاريخ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,جعل المكوس الفاتورة
@@ -2743,7 +2758,7 @@ DocType: Quality Inspection,Delivery Note No,ملاحظة لا تسليم
 DocType: Company,Retail,بيع بالتجزئة
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,العملاء {0} غير موجود
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
@@ -2771,9 +2786,9 @@ DocType: Sales Invoice,Product Bundle Help,المنتج حزمة مساعدة
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,العثور على أي سجل
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,الحصول على عناصر من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,الحصول على عناصر من حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,حساب {0} غير نشط
-DocType: GL Entry,Is Advance,هو المقدمة
+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,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
@@ -2939,7 +2954,7 @@ 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.,تسمح للمستخدمين التالية للموافقة على طلبات الحصول على إجازة أيام بلوك.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,تسمح للمستخدمين التالية للموافقة على طلبات الحصول على إجازة أيام فترة.
 apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,أنواع المطالبة حساب.
 DocType: Item,Taxes,الضرائب
 DocType: Project,Default Cost Center,افتراضي مركز التكلفة
@@ -2962,13 +2977,13 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),معدل ( ٪ )
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,جعل مورد اقتباس
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,جعل مورد اقتباس
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),خفض عائد لإجازة بدون أجر (LWP)
 apps/erpnext/erpnext/public/js/setup_wizard.js +274,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,أجازة عارضة
 DocType: Batch,Batch ID,دفعة ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
@@ -2985,9 +3000,10 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,الع
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,وفي تاريخ الشركة
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,النشرات الإخبارية
 DocType: Address,Shipping,الشحن
-DocType: Stock Ledger Entry,Stock Ledger Entry,الأسهم ليدجر الدخول
+DocType: Stock Ledger Entry,Stock Ledger Entry,حركة سجل المخزن
 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} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
@@ -3004,7 +3020,6 @@ DocType: Account,Auditor,مدقق حسابات
 DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,عودة
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
 DocType: Project Task,Pending Review,في انتظار المراجعة
@@ -3039,7 +3054,7 @@ DocType: Payment Tool Detail,Against Voucher No,ضد قسيمة لا
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,التاريخ الموظف العمل الخارجي
 DocType: Tax Rule,Purchase,شراء
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,التوازن الكمية
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,الكمية المتاحة
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ل {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,مراكز التكلفة
@@ -3049,6 +3064,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,التالي اتصل بنا
 DocType: Employee,Employment Type,مجال العمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,الموجودات الثابتة
+,Cash Flow,التدفق النقدي
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,فترة التطبيق لا يمكن أن يكون عبر اثنين من السجلات alocation
 DocType: Item Group,Default Expense Account,الافتراضي نفقات الحساب
 DocType: Employee,Notice (days),إشعار (أيام )
@@ -3061,7 +3077,7 @@ 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 +125,Please find attached {0} #{1},تجدون طيه {0} # {1}
 DocType: Job Applicant,Applicant Name,اسم مقدم الطلب
-DocType: Authorization Rule,Customer / Item Name,العميل / البند الاسم
+DocType: Authorization Rule,Customer / Item Name,العميل / أسم البند
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 

 The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
@@ -3086,7 +3102,7 @@ DocType: Workstation,per hour,كل ساعة
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,المبلغ المدفوع
+apps/erpnext/erpnext/public/js/pos/pos.js +428,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}٪
@@ -3113,7 +3129,7 @@ DocType: POS Profile,Terms and Conditions,الشروط والأحكام
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك الحفاظ على الطول والوزن، والحساسية، الخ المخاوف الطبية
 DocType: Leave Block List,Applies to Company,ينطبق على شركة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الأسهم المقدم {0} موجود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
 DocType: Purchase Invoice,In Words,في كلمات
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
 DocType: Production Planning Tool,Material Request For Warehouse,طلب للحصول على المواد مستودع
@@ -3128,7 +3144,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","لتعيين هذه السنة المالية كما الافتراضي، انقر على ' تعيين كافتراضي """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),إعداد ملقم واردة ل دعم البريد الإلكتروني معرف . (على سبيل المثال support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,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.",توليد التعبئة زلات لحزم ليتم تسليمها. تستخدم لإعلام عدد حزمة، حزمة المحتويات وزنه.
@@ -3230,7 +3246,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +4
 DocType: Payment Tool,Get Outstanding Vouchers,الحصول على قسائم المعلقة
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Appraisal,Start Date,تاريخ البدء
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,تخصيص يترك لفترة .
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,تخصيص أجازات لفترة .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,انقر هنا للتحقق من
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: لا يمكنك تعيين نفسه كحساب الأم
 DocType: Purchase Invoice Item,Price List Rate,قائمة الأسعار قيم
@@ -3241,12 +3257,12 @@ DocType: Time Log,Hours,ساعات
 DocType: Project,Expected Start Date,يتوقع البدء تاريخ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,تسلم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,Receive,تسلم
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
-DocType: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
+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 +424,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
@@ -3336,16 +3352,16 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit
 DocType: Buying Settings,Naming Series,تسمية السلسلة
 DocType: Leave Block List,Leave Block List Name,ترك اسم كتلة قائمة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,الموجودات الأسهم
-apps/erpnext/erpnext/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,الهدف الكمية
 DocType: Attendance,Present,تقديم
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا المقدمة
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا تكون مسجلة
 DocType: Notification Control,Sales Invoice Message,فاتورة مبيعات رسالة
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,إغلاق حساب {0} يجب أن يكون من نوع المسؤولية / حقوق المساهمين
 DocType: Authorization Rule,Based On,وبناء على
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
@@ -3465,7 +3481,7 @@ DocType: Company,Round Off Account,جولة قبالة حساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,الاستشارات
 DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغيير
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,تغيير
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
@@ -3481,7 +3497,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3547,7 +3563,7 @@ DocType: Account,Parent Account,الأصل حساب
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/public/js/pos/pos.js +96,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} ك ' اليسار '
@@ -3572,7 +3588,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,دفعة الجرد
 DocType: Employee,Contract End Date,تاريخ نهاية العقد
 DocType: Sales Order,Track this Sales Order against any Project,تتبع هذا الأمر ضد أي مشروع المبيعات
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سحب أوامر البيع (في انتظار لتسليم) بناء على المعايير المذكورة أعلاه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,من مزود اقتباس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,من مزود اقتباس
 DocType: Deduction Type,Deduction Type,خصم نوع
 DocType: Attendance,Half Day,نصف يوم
 DocType: Pricing Rule,Min Qty,دقيقة الكمية
@@ -3659,7 +3675,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,الحصول على عناصر من BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,الحصول على عناصر من BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,يوم ووقت مبادرة البيع
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,فاتورة المواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Се изисква валута за Ценоразпис {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ще се изчисли при транзакция.
 DocType: Purchase Order,Customer Contact,Клиента Контакти
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,От Материал Искане
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,От Материал Искане
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дървовидно
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Не повече резултати.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. To maintain the customer wise item code and to make them searchable based on their code use this option
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Покажи Варианти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличност
@@ -63,7 +63,7 @@ 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 +606,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Имейл Адрес
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Превозно средство не
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Моля изберете Ценоразпис
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Моля изберете Ценоразпис
 DocType: Production Order Operation,Work In Progress,Незавършено производство
 DocType: Employee,Holiday List,Holiday Списък
 DocType: Time Log,Time Log,Време Log
@@ -214,6 +214,7 @@ DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Моля, въведете Company"
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
+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 +203,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
@@ -232,7 +233,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 DocType: Payment Tool,Reference No,Референтен номер по
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
@@ -244,7 +245,7 @@ DocType: Item,Minimum Order Qty,Минимална поръчка Количес
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Точка {0} е отменен
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
@@ -307,7 +308,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to 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 +628,Select Item,Изберете Точка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +262,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
@@ -380,13 +381,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Продажби
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +554,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday майстор.
 DocType: Material Request Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Моля, въведете Код."
 DocType: BOM,Costing,Остойностяване
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е избрано, размерът на данъка ще се считат за която вече е включена в Print Курсове / Print размер"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Общо Количество
@@ -486,7 +487,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Клиентска б
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.,"Логически Склад, за които са направени стоковите разписки."
@@ -514,9 +515,10 @@ DocType: Buying Settings,Supplier Naming By,"Доставчик наименув
 DocType: Activity Type,Default Costing Rate,Default Остойностяване Курсове
 DocType: Maintenance Schedule,Maintenance Schedule,График за поддръжка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
+apps/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/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,От Покупка Разписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,От Покупка Разписка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
 DocType: SMS Settings,Receiver Parameter,Приемник на параметъра
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Въз основа на"" и ""Групиране По"" не може да бъде един и същ"
@@ -776,7 +778,8 @@ 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 +626,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
@@ -797,7 +800,7 @@ 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/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепете вашата снимка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Правя
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Make ,Правя
 DocType: Journal Entry,Total Amount in Words,Обща сума в Думи
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Имаше грешка. Една вероятна причина може да бъде, че не сте запаметили формата. Моля, свържете се support@erpnext.com ако проблемът не бъде отстранен."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Моята количка
@@ -819,10 +822,10 @@ DocType: Packing Slip Item,Packing Slip Item,"Приемо-предавател
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Отстъпка
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Отстъпка
 DocType: Features Setup,Purchase Discounts,Изкупните Отстъпки
 DocType: Workstation,Wages,Заплати
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Ще бъде актуализиран, само ако времето Log е &quot;Подлежащи на таксуване&quot;"
@@ -889,6 +892,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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 и подадем да създадете нов фактурата за продажба.
@@ -1029,7 +1033,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company валути)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Общо Outgoing
@@ -1101,6 +1105,7 @@ 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 +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1112,7 +1117,7 @@ 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 +471,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1160,7 +1165,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Анал
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",За да се даде възможност на &quot;точка на продажба&quot; изглед
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
+apps/erpnext/erpnext/public/js/pos/pos.js +408,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,В Количество
@@ -1179,6 +1184,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансова година Начална дата
 DocType: Employee External Work History,Total Experience,Общо Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,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,Товарни и спедиция Такси
 DocType: Material Request Item,Sales Order No,Продажбите Заповед №
 DocType: Item Group,Item Group Name,Име на артикул Group
@@ -1191,7 +1197,7 @@ DocType: Maintenance Schedule,Schedules,Списъци
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Подробности Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Допълнителна отстъпка сума (във Валута на Фирмата)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Моля да създадете нов акаунт от сметкоплан.
 DocType: Maintenance Visit,Maintenance Visit,Поддръжка посещение
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Customer Group&gt; Territory
@@ -1241,7 +1247,7 @@ DocType: Production Planning Tool,Select Sales Orders,Изберете Прод
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са празници. Не е нужно да кандидатствате за отпуск."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,За да проследите предмети с помощта на баркод. Вие ще бъдете в състояние да влезе елементи в Бележка за доставка и фактурата за продажба чрез сканиране на баркод на артикул.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Маркирай като Доставени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Маркирай като Доставени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи оферта
 DocType: Dependent Task,Dependent Task,Зависим Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
@@ -1251,7 +1257,8 @@ DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рож
 DocType: SMS Center,Receiver List,Списък Receiver
 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 +491,{0} View,{0} Изглед
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Изглед
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Нетна промяна в Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за Издадена артикули
@@ -1288,6 +1295,7 @@ DocType: Payment Reconciliation,Payments,Плащания
 DocType: Budget Detail,Budget Allocated,"Бюджетът, отпуснат"
 DocType: Journal Entry,Entry Type,Влизане Type
 ,Customer Credit Balance,Customer кредитно салдо
+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 +53,Update bank payment dates with journals.,Актуализиране дати банкови платежни с списания.
@@ -1335,7 +1343,7 @@ DocType: Upload Attendance,Get Template,Вземи Template
 DocType: Address,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,"A Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Моля изберете {0} на първо място.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Моля изберете {0} на първо място.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Territory
 DocType: Quality Inspection Reading,Reading 2,Четене 2
@@ -1369,7 +1377,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Оставете осребряват?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity От поле е задължително
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
@@ -1394,7 +1402,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Нанесете Warehouse-мъ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} трябва да бъде представено
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Вход за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плащане
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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,Поздрав
@@ -1501,7 +1509,7 @@ DocType: Appraisal,For Employee Name,За Име на служител
 DocType: Holiday List,Clear Table,Clear Таблица
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Фактура Не
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,От поръчка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,От поръчка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Адреси на клиенти и контакти
@@ -1741,13 +1749,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 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 +576,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transfer Материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да изберете
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
 DocType: Installation Note,Installation Note,Монтаж Note
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Добави Данъци
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Парични потоци от финансова
 ,Financial Analytics,Финансови Analytics
 DocType: Quality Inspection,Verified By,Проверени от
 DocType: Address,Subsidiary,Филиал
@@ -1790,6 +1799,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Tool,Payment Account,Разплащателна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
+apps/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
@@ -2089,7 +2099,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
 DocType: Quality Inspection,Quality Inspection,Проверка на качеството
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи"
@@ -2141,7 +2151,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листните възли са позволени в сделка
 DocType: Expense Claim,Expense Approver,Expense одобряващ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Плащане
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Плащане
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Към за дата
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
@@ -2188,7 +2198,7 @@ DocType: Target Detail,Target Detail,Target Подробности
 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,Cost Center със съществуващите операции не могат да бъдат превърнати в група
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
+DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип сделка
@@ -2213,6 +2223,7 @@ DocType: Quality Inspection,Outgoing,Изходящ
 DocType: Material Request,Requested For,Поискана за
 DocType: Quotation Item,Against Doctype,Срещу Вид Документ
 DocType: Delivery Note,Track this Delivery Note against any Project,Абонирай се за тази доставка Note срещу всеки проект
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Net Cash от Инвестиране
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root сметка не може да бъде изтрита
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показване на вписване в запасите
 ,Is Primary Address,Дали Основен адрес
@@ -2350,9 +2361,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Поземлен Cost
 DocType: Time Log,Batched for Billing,Дозирани за фактуриране
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, повдигнати от доставчици."
 DocType: POS Profile,Write Off Account,Отпишат Акаунт
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Net Cash от Operations
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,например ДДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Позиция 4
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
@@ -2526,7 +2537,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 			conflict by assigning priority. Price Rules: {0}","Multiple Цена правило съществува с едни и същи критерии, моля решаване \ конфликт чрез възлагане приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материал Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
 DocType: Hub Settings,Access Token,Access Token
@@ -2546,6 +2557,7 @@ DocType: Purchase Invoice Item,Image View,Вижте изображението
 DocType: Issue,Opening Time,Откриване на времето
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и до датите, изисквани"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
+apps/erpnext/erpnext/stock/doctype/item/item.py +544,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
@@ -2553,6 +2565,7 @@ DocType: Tax Rule,Shipping City,Доставка City
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Тази позиция е вариант на {0} (по образец). Атрибути ще бъдат копирани от шаблона, освен ако &quot;Не Copy&quot; е зададен"
 DocType: Account,Purchase User,Покупка на потребителя
 DocType: Notification Control,Customize the Notification,Персонализиране на Notification
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Парични потоци от операции
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
 DocType: Journal Entry,Print Heading,Print Heading
@@ -2593,7 +2606,7 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Трансфер Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Трансфер Материал на доставчик
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Създаване на цитата
@@ -2605,7 +2618,7 @@ 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},Row {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,От Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,От Каталог Bundle
 DocType: Production Planning Tool,Production Planning Tool,Tool Производствено планиране
 DocType: Quality Inspection,Report Date,Доклад Дата
 DocType: C-Form,Invoices,Фактури
@@ -2620,6 +2633,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Customer Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: Item,Website Description,Website Описание
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нетна промяна в собствения капитал
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
 ,Sales Register,Продажбите Регистрация
 DocType: Quotation,Quotation Lost Reason,Цитат Загубени Причина
@@ -2631,7 +2645,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 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 +485,Get Items,Вземи артикули
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Вземи артикули
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последна Поръчка Дата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направи акцизите Invoice
@@ -2681,7 +2695,7 @@ DocType: Quality Inspection,Delivery Note No,Бележка за доставк
 DocType: Company,Retail,На дребно
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} не съществува
 DocType: Attendance,Absent,Липсващ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Каталог Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
@@ -2709,7 +2723,7 @@ DocType: Sales Invoice,Product Bundle Help,Каталог Bundle Помощ
 ,Monthly Attendance Sheet,Месечен зрители Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не са намерени записи
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Получават от продукта Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Получават от продукта Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Сметка {0} е неактивна
 DocType: GL Entry,Is Advance,Дали Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Присъствие От Дата и зрители към днешна дата е задължително
@@ -2899,7 +2913,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Допълнителна Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансова година Крайна дата
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако групирани по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направи Доставчик оферта
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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)"
@@ -2922,6 +2936,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Раб
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Изкупуването Курсове
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Количеството общо Issue / Transfer {0} в Подемно-Искане {1} не може да бъде по-голяма от исканата количество {2} за позиция {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Бюлетини
 DocType: Address,Shipping,Кораби
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фондова Ledger Влизане
@@ -2941,7 +2956,6 @@ DocType: Account,Auditor,Одитор
 DocType: Purchase Order,End date of current order's period,Крайна дата на периода на текущата поръчката
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направи оферта Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Връщане
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
 DocType: Production Order Operation,Production Order Operation,Производство Поръчка Operation
 DocType: Pricing Rule,Disable,Правя неспособен
 DocType: Project Task,Pending Review,До Review
@@ -2986,6 +3000,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Следваща Контакт
 DocType: Employee,Employment Type,Тип заетост
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Дълготрайни активи
+,Cash Flow,Паричен поток
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Срок за кандидатстване не може да бъде в два alocation записи
 DocType: Item Group,Default Expense Account,Default Expense Account
 DocType: Employee,Notice (days),Известие (дни)
@@ -3023,7 +3038,7 @@ DocType: Workstation,per hour,на час
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,"Сума, платена"
+apps/erpnext/erpnext/public/js/pos/pos.js +428,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}%,Max отстъпка разрешено за покупка: {0} е {1}%
@@ -3065,7 +3080,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup входящия сървър за подкрепа имейл ID. (Например support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата 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.","Генериране на товарителници за пакети трябва да бъдат доставени. Използва се за уведомяване на пакетите номер, съдържание на пакети и теглото му."
@@ -3167,7 +3182,7 @@ DocType: Time Log,Hours,Часове
 DocType: Project,Expected Start Date,Очаквана начална дата
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Махни позиция, ако цените не се отнася за тази позиция"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Напр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Получавам
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,Receive,Получавам
 DocType: Maintenance Visit,Fully Completed,Завършен до ключ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Завършен
 DocType: Employee,Educational Qualification,Образователно-квалификационна
@@ -3271,7 +3286,7 @@ DocType: Notification Control,Sales Invoice Message,Съобщението фа
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриване на профила {0} трябва да е от тип Отговорност / Equity
 DocType: Authorization Rule,Based On,Базиран На
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Дейността на проект / задача.
@@ -3390,7 +3405,7 @@ DocType: Company,Round Off Account,Завършете Акаунт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни разходи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консултативен
 DocType: Customer Group,Parent Customer Group,Родител Customer Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промяна
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Промяна
 DocType: Purchase Invoice,Contact Email,Контакт Email
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
@@ -3406,7 +3421,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3472,7 +3487,7 @@ DocType: Account,Parent Account,Родител Акаунт
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Ваучер Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценова листа не е намерен или инвалиди
+apps/erpnext/erpnext/public/js/pos/pos.js +96,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} трябва да се зададе като &quot;Ляв&quot;
@@ -3497,7 +3512,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Инвентар
 DocType: Employee,Contract End Date,Договор Крайна дата
 DocType: Sales Order,Track this Sales Order against any Project,Абонирай се за тази поръчка за продажба срещу всеки проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Поръчки за продажба Pull (висящите да достави), основано на горните критерии"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,От Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,От Доставчик оферта
 DocType: Deduction Type,Deduction Type,Приспадане Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Количество
@@ -3584,7 +3599,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Получават от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* লেনদেনে গণনা করা হবে.
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,উপাদান অনুরোধ থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,উপাদান অনুরোধ থেকে
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} বৃক্ষ
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,কোন ফলাফল.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ব
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. গ্রাহক জ্ঞানী আইটেমটি কোড বজায় রাখা এবং তাদের কোড ব্যবহার করা এই অপশনটি স্থান উপর ভিত্তি করে এদের অনুসন্ধানযোগ্য করে
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,দেখান রুপভেদ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,স্টক ইন
@@ -63,7 +63,7 @@ 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 +606,Invoice,চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ইমেল ঠিকানা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,সারি # {0}:
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,মূল্য তালিকা নির্বাচন করুন
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,মূল্য তালিকা নির্বাচন করুন
 DocType: Production Order Operation,Work In Progress,কাজ চলছে
 DocType: Employee,Holiday List,ছুটির তালিকা
 DocType: Time Log,Time Log,টাইম ইন
@@ -214,6 +214,7 @@ DocType: Sales Partner,Reseller,রিসেলার
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,কোম্পানী লিখুন দয়া করে
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
+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 +203,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
@@ -232,7 +233,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
@@ -244,7 +245,7 @@ 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 +596,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
@@ -307,7 +308,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to 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} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,পছন্দ করো
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +262,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
@@ -380,13 +381,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,সেলস ম
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +554,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,হলিডে মাস্টার.
 DocType: Material Request Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
 DocType: BOM,Costing,খোয়াতে
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,মোট Qty
@@ -486,7 +487,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,গ্রাহক ড
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
@@ -514,9 +515,10 @@ DocType: Buying Settings,Supplier Naming By,দ্বারা সরবরা
 DocType: Activity Type,Default Costing Rate,ডিফল্ট খোয়াতে হার
 DocType: Maintenance Schedule,Maintenance Schedule,রক্ষণাবেক্ষণ সময়সূচী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","তারপর দামে ইত্যাদি গ্রাহক, ক্রেতা গ্রুপ, টেরিটরি, সরবরাহকারী, কারখানা, সরবরাহকারী ধরন, প্রচারাভিযান, বিক্রয় অংশীদার উপর ভিত্তি করে ফিল্টার আউট হয়"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,পরিসংখ্যা মধ্যে নিট পরিবর্তন
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,কেনার রসিদ থেকে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,কেনার রসিদ থেকে
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 DocType: SMS Settings,Receiver Parameter,রিসিভার পরামিতি
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,এবং &#39;গ্রুপ দ্বারা&#39; &#39;উপর ভিত্তি করে&#39; একই হতে পারে না
@@ -776,7 +778,8 @@ 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 +626,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
@@ -797,7 +800,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,সাদ
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,তোমার ছবি সংযুক্ত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Make ,করা
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,সেখানে একটা ভুল ছিল. এক সম্ভাব্য কারণ আপনার ফর্ম সংরক্ষণ করেন নি যে হতে পারে. সমস্যা থেকে গেলে support@erpnext.com সাথে যোগাযোগ করুন.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,আমার ট্রলি
@@ -819,10 +822,10 @@ DocType: Packing Slip Item,Packing Slip Item,প্যাকিং স্লি
 DocType: POS Profile,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,ডিসকাউন্ট
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ডিসকাউন্ট
 DocType: Features Setup,Purchase Discounts,ক্রয় ডিসকাউন্ট
 DocType: Workstation,Wages,মজুরি
 DocType: Time Log,Will be updated only if Time Log is 'Billable',টাইম ইন &#39;বিলযোগ্য&#39; হয় তাহলে শুধুমাত্র আপডেট করা হবে
@@ -889,6 +892,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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.,সময় লগসমূহ নির্বাচন করুন এবং একটি নতুন বিক্রয় চালান তৈরি জমা দিন.
@@ -1029,7 +1033,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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,মোট আউটগোয়িং
@@ -1101,6 +1105,7 @@ 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 +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},সর্বোচ্চ: {0}
@@ -1112,7 +1117,7 @@ DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1160,7 +1165,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,বি
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
 DocType: Item,Inventory,জায়
 DocType: Features Setup,"To enable ""Point of Sale"" view",দেখুন &quot;বিক্রয় বিন্দু&quot; সচল করুন
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
+apps/erpnext/erpnext/public/js/pos/pos.js +408,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 ইন
@@ -1179,6 +1184,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
 DocType: Employee External Work History,Total Experience,মোট অভিজ্ঞতা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
+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,মাল ও ফরোয়ার্ডিং চার্জ
 DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন
 DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম
@@ -1191,7 +1197,7 @@ DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),অতিরিক্ত মূল্য ছাড়ের পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,অ্যাকাউন্ট চার্ট থেকে নতুন একাউন্ট তৈরি করুন.
 DocType: Maintenance Visit,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; টেরিটরি
@@ -1241,7 +1247,7 @@ DocType: Production Planning Tool,Select Sales Orders,বিক্রয় আ
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,বারকোড ব্যবহার আইটেম ট্র্যাক. আপনি আইটেম এর বারকোড স্ক্যানিং দ্বারা হুণ্ডি এবং বিক্রয় চালান মধ্যে আইটেম প্রবেশ করতে সক্ষম হবে.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,মার্ক হিসাবে বিতরণ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,মার্ক হিসাবে বিতরণ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,উদ্ধৃতি করা
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
@@ -1251,7 +1257,8 @@ DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
 DocType: Payment Tool Detail,Payment Amount,পরিশোধিত অর্থ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} দেখুন
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} দেখুন
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
@@ -1288,6 +1295,7 @@ DocType: Payment Reconciliation,Payments,পেমেন্টস্
 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',&#39;Customerwise ছাড়&#39; জন্য প্রয়োজনীয় গ্রাহক
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,পত্রিকার সঙ্গে ব্যাংক পেমেন্ট তারিখ আপডেট করুন.
@@ -1335,7 +1343,7 @@ DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Address,Postal,ঠিকানা
 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 +147,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},টেক্সট {0}
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
@@ -1369,7 +1377,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
@@ -1394,7 +1402,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,ওয়ারহাউস অ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,কাজগুলো জন্য টাইম ইন.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,প্রদান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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,অভিবাদন
@@ -1501,7 +1509,7 @@ DocType: Appraisal,For Employee Name,কর্মচারীর নাম জ
 DocType: Holiday List,Clear Table,সাফ ছক
 DocType: Features Setup,Brands,ব্র্যান্ড
 DocType: C-Form Invoice Detail,Invoice No,চালান নং
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ক্রয় অর্ডার থেকে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,ক্রয় অর্ডার থেকে
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,গ্রাহক ঠিকানা এবং পরিচিতি
@@ -1741,13 +1749,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,টুল পুনঃনামকরণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,ট্রান্সফার উপাদান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
 DocType: Installation Note,Installation Note,ইনস্টলেশন উল্লেখ্য
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,করের যোগ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,অর্থায়ন থেকে ক্যাশ ফ্লো
 ,Financial Analytics,আর্থিক বিশ্লেষণ
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 DocType: Address,Subsidiary,সহায়ক
@@ -1790,6 +1799,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Tool,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
@@ -2089,7 +2099,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 DocType: Quality Inspection,Quality Inspection,উচ্চমানের তদন্ত
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
@@ -2141,7 +2151,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Expense Claim,Expense Approver,ব্যয় রাজসাক্ষী
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,বেতন
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,বেতন
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime করুন
 DocType: SMS Settings,SMS Gateway URL,এসএমএস গেটওয়ে ইউআরএল
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
@@ -2188,7 +2198,7 @@ DocType: Target Detail,Target Detail,উদ্দিষ্ট বিস্তা
 DocType: Sales Order,% of materials billed against this Sales Order,উপকরণ% এই বিক্রয় আদেশের বিরুদ্ধে বিল
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,সময়কাল সমাপন ভুক্তি
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,অবচয়
+DocType: Account,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
 DocType: Customer,Credit Limit,ক্রেডিট সীমা
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,লেনদেনের ধরন নির্বাচন করুন
@@ -2213,6 +2223,7 @@ DocType: Quality Inspection,Outgoing,বহির্গামী
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,বিনিয়োগ থেকে নিট ক্যাশ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,দেখান স্টক সাজপোশাকটি
 ,Is Primary Address,প্রাথমিক ঠিকানা
@@ -2350,9 +2361,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ল্যান্ড
 DocType: Time Log,Batched for Billing,বিলিং জন্য শ্রেণীবদ্ধ
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,প্রস্তাব উত্থাপিত বিল.
 DocType: POS Profile,Write Off Account,অ্যাকাউন্ট বন্ধ লিখতে
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,অপারেশন থেকে নিট ক্যাশ
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,যেমন ভ্যাট
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,আইটেম 4
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
@@ -2526,7 +2537,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 			conflict by assigning priority. Price Rules: {0}","একাধিক মূল্য রুল একই মানদণ্ডের সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ দ্বারা \ দ্বন্দ্ব সমাধান করুন. দাম বিধি: {0}"
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 DocType: Hub Settings,Access Token,অ্যাক্সেস টোকেন
@@ -2546,6 +2557,7 @@ DocType: Purchase Invoice Item,Image View,চিত্র দেখুন
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
+apps/erpnext/erpnext/stock/doctype/item/item.py +544,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,মূল্যনির্ধারণ এবং মোট
@@ -2553,6 +2565,7 @@ DocType: Tax Rule,Shipping City,শিপিং সিটি
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"এই আইটেম {0} (টেমপ্লেট) একটি বৈকল্পিক. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আরোপ টেমপ্লেট থেকে কপি করা হবে"
 DocType: Account,Purchase User,ক্রয় ব্যবহারকারী
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
 DocType: Journal Entry,Print Heading,প্রিন্ট শীর্ষক
@@ -2593,7 +2606,7 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,ঘন্টা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,উদ্ধৃতি তৈরি
@@ -2605,7 +2618,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,প্রতিস্থ
 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/purchase_invoice/purchase_invoice.js +438,From Product Bundle,পণ্য বান্ডিল থেকে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,পণ্য বান্ডিল থেকে
 DocType: Production Planning Tool,Production Planning Tool,উৎপাদন পরিকল্পনা টুল
 DocType: Quality Inspection,Report Date,প্রতিবেদন তারিখ
 DocType: C-Form,Invoices,চালান
@@ -2620,6 +2633,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,গ্রাহক গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,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,এএমসি মেয়াদ শেষ হওয়ার তারিখ
 ,Sales Register,সেলস নিবন্ধন
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
@@ -2631,7 +2645,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 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 +485,Get Items,জানানোর পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,জানানোর পান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,শেষ আদেশ তারিখ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,আবগারি চালান করুন
@@ -2681,7 +2695,7 @@ DocType: Quality Inspection,Delivery Note No,হুণ্ডি কোন
 DocType: Company,Retail,খুচরা
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,গ্রাহক {0} অস্তিত্ব নেই
 DocType: Attendance,Absent,অনুপস্থিত
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,পণ্য সমষ্টি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
@@ -2709,7 +2723,7 @@ DocType: Sales Invoice,Product Bundle Help,পণ্য সমষ্টি স
 ,Monthly Attendance Sheet,মাসিক উপস্থিতি পত্রক
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,পাওয়া কোন রেকর্ড
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,অ্যাকাউন্ট {0} নিষ্ক্রীয়
 DocType: GL Entry,Is Advance,অগ্রিম
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,জন্ম তারিখ এবং উপস্থিত এ্যাটেনডেন্স বাধ্যতামূলক
@@ -2899,7 +2913,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),হার (%)
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য আদায় হ্রাস (LWP)
@@ -2922,6 +2936,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ফু
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,নিউজ লেটার
 DocType: Address,Shipping,পরিবহন
 DocType: Stock Ledger Entry,Stock Ledger Entry,স্টক লেজার এণ্ট্রি
@@ -2941,7 +2956,6 @@ DocType: Account,Auditor,নিরীক্ষক
 DocType: Purchase Order,End date of current order's period,বর্তমান অর্ডারের সময়ের শেষ তারিখ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,অফার লেটার করুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,প্রত্যাবর্তন
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
@@ -2986,6 +3000,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,পরবর্তী যোগাযোগ
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
+,Cash Flow,নগদ প্রবাহ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,আবেদনের সময় দুই alocation রেকর্ড জুড়ে হতে পারে না
 DocType: Item Group,Default Expense Account,ডিফল্ট ব্যায়ের অ্যাকাউন্ট
 DocType: Employee,Notice (days),নোটিশ (দিন)
@@ -3023,7 +3038,7 @@ DocType: Workstation,per hour,প্রতি ঘণ্টা
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,পরিমাণ অর্থ প্রদান করা
+apps/erpnext/erpnext/public/js/pos/pos.js +428,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}% হল
@@ -3065,7 +3080,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),সমর্থন ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,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.","প্যাকেজ বিতরণ করা জন্য স্লিপ বোঁচকা নির্মাণ করা হয়. বাক্স সংখ্যা, প্যাকেজের বিষয়বস্তু এবং তার ওজন অবহিত করা."
@@ -3167,7 +3182,7 @@ DocType: Time Log,Hours,ঘন্টা
 DocType: Project,Expected Start Date,প্রত্যাশিত স্টার্ট তারিখ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,যেমন. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,গ্রহণ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,Receive,গ্রহণ করা
 DocType: Maintenance Visit,Fully Completed,সম্পূর্ণরূপে সম্পন্ন
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% সমাপ্তি
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
@@ -3271,7 +3286,7 @@ 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 +580,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
@@ -3390,7 +3405,7 @@ DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,প্রশাসনিক খরচ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,পরামর্শকারী
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,পরিবর্তন
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,পরিবর্তন
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
@@ -3406,7 +3421,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3472,7 +3487,7 @@ DocType: Account,Parent Account,মূল অ্যাকাউন্ট
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/public/js/pos/pos.js +96,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;বাম&#39; হিসাবে
@@ -3497,7 +3512,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,ব্যাচ পর
 DocType: Employee,Contract End Date,চুক্তি শেষ তারিখ
 DocType: Sales Order,Track this Sales Order against any Project,কোন প্রকল্পের বিরুদ্ধে এই বিক্রয় আদেশ ট্র্যাক
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,টানুন বিক্রয় আদেশ উপরে মাপকাঠির ভিত্তিতে (বিলি মুলতুবি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
 DocType: Deduction Type,Deduction Type,সিদ্ধান্তগ্রহণ ধরন
 DocType: Attendance,Half Day,অর্ধদিবস
 DocType: Pricing Rule,Min Qty,ন্যূনতম Qty
@@ -3584,7 +3599,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,উপকরণ বিল
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show Varijante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Tekuća godina
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,U Stock
@@ -63,7 +63,7 @@ apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Na
 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 +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail adresa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Molimo odaberite Cjenik
 DocType: Production Order Operation,Work In Progress,Radovi u toku
 DocType: Employee,Holiday List,Lista odmora
 DocType: Time Log,Time Log,Vrijeme Log
@@ -215,6 +215,7 @@ DocType: Sales Partner,Reseller,Prodavač
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
+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 +203,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
@@ -233,7 +234,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
@@ -245,7 +246,7 @@ DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavite u Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Artikal {0} je otkazan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
@@ -308,7 +309,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to customer'
 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 +628,Select Item,Odaberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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"
@@ -382,13 +383,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Manager Mas
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,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 +554,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
@@ -491,7 +492,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Šifarnik kupaca
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.
@@ -519,9 +520,10 @@ DocType: Buying Settings,Supplier Naming By,Dobavljač nazivanje
 DocType: Activity Type,Default Costing Rate,Uobičajeno Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Održavanje Raspored
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
+apps/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/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Račun kupnje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Od Račun kupnje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Istu stavku je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupiranje po ' ne mogu biti isti
@@ -800,7 +802,8 @@ DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set iznos uplate =
 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 +626,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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
@@ -821,7 +824,7 @@ 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/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Napraviti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +3,My Cart,Moja košarica
@@ -843,10 +846,10 @@ DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +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 +550,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plata
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurirati samo ako Vrijeme dnevnika &#39;naplative&#39;
@@ -913,6 +916,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 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 +209,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 +881,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.
@@ -1053,7 +1057,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani datum isporuke je manje nego što je planirano Ozljede Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno Odlazni
@@ -1125,6 +1129,7 @@ DocType: Sales Order Item,Planned Quantity,Planirana količina
 DocType: Purchase Invoice Item,Item Tax Amount,Iznos poreza artikla
 DocType: Item,Maintain Stock,Održavati Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1136,7 +1141,7 @@ 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 +471,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1185,7 +1190,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analiti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Opportunity,With Items,Sa stavkama
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
@@ -1204,6 +1209,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina Start Date
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,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
 DocType: Material Request Item,Sales Order No,Narudžba kupca br
 DocType: Item Group,Item Group Name,Naziv grupe artikla
@@ -1216,7 +1222,7 @@ DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Korisnička Group> Regija
@@ -1266,7 +1272,7 @@ DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark kao Isporučena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Mark kao Isporučena
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make ponudu
 DocType: Dependent Task,Dependent Task,Zavisna Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,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}
@@ -1276,7 +1282,8 @@ DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
 DocType: Payment Tool Detail,Payment Amount,Plaćanje Iznos
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Pogledaj
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,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 +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
@@ -1313,6 +1320,7 @@ DocType: Payment Reconciliation,Payments,Plaćanja
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Entry Tip
 ,Customer Credit Balance,Customer Credit Balance
+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 +53,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
@@ -1360,7 +1368,7 @@ DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
 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,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Odaberite {0} na prvom mjestu.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1394,7 +1402,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Od polje je obavezno
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,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 +129,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
@@ -1419,7 +1427,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite Skladište-mudar Ponov
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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
@@ -1527,7 +1535,7 @@ DocType: Appraisal,For Employee Name,Za ime zaposlenika
 DocType: Holiday List,Clear Table,Poništi tabelu
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Od narudžbenice
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kupac adrese i kontakti
@@ -1767,13 +1775,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 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 +576,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
 DocType: Installation Note,Installation Note,Napomena instalacije
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Novčani tok iz Financiranje
 ,Financial Analytics,Financijski Analytics
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
@@ -1816,6 +1825,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Plaćanje računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo Vas da proverite da li ste zaista želite izbrisati sve transakcije za ovu kompaniju. Tvoj gospodar podaci će ostati kao što je to. Ova akcija se ne može poništiti.
@@ -2148,7 +2158,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
@@ -2200,7 +2210,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platiti
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To datuma i vremena
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
@@ -2247,7 +2257,7 @@ DocType: Target Detail,Target Detail,Ciljana Detalj
 DocType: Sales Order,% of materials billed against this Sales Order,% Materijala naplaćeno protiv ovog prodajnog naloga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Period zatvaranja Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
+DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite vrstu transakcije
@@ -2272,6 +2282,7 @@ DocType: Quality Inspection,Outgoing,Društven
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
+apps/erpnext/erpnext/accounts/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 +176,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Stock unosi
 ,Is Primary Address,Je primarna adresa
@@ -2409,9 +2420,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Sleteo Cost vaučera I
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos rabata
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Neto novčani tok od operacije
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
@@ -2586,7 +2597,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 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 +580,Issue Material,Izdanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Izdanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 DocType: Hub Settings,Access Token,Access Token
@@ -2606,6 +2617,7 @@ DocType: Purchase Invoice Item,Image View,Prikaz slike
 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 +544,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
@@ -2613,6 +2625,7 @@ DocType: Tax Rule,Shipping City,Dostava City
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, osim 'Ne Copy ""je postavljena"
 DocType: Account,Purchase User,Kupovina korisnika
 DocType: Notification Control,Customize the Notification,Prilagodite Obavijest
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Novčani tok iz poslovanja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
 DocType: Journal Entry,Print Heading,Ispis Naslov
@@ -2654,7 +2667,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Sat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
 koristeći Stock pomirenje"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfera Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Transfera Materijal dobavljaču
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,stvaranje citata
@@ -2666,7 +2679,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nije važeći {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle proizvoda
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
 DocType: C-Form,Invoices,Fakture
@@ -2681,6 +2694,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Kupac Grupa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Web stranica Opis
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto promjena u kapitalu
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
@@ -2692,7 +2706,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Kreiraj proizvode
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Datum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
@@ -2742,7 +2756,7 @@ DocType: Quality Inspection,Delivery Note No,Otpremnica br
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
 DocType: Upload Attendance,Download Template,Preuzmite predložak
@@ -2770,7 +2784,7 @@ DocType: Sales Invoice,Product Bundle Help,Proizvod Bundle Pomoć
 ,Monthly Attendance Sheet,Mjesečna posjećenost list
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ne rekord naći
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: troška je obvezno za točku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} nije aktivan
 DocType: GL Entry,Is Advance,Je avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledatelja Od datuma i posjećenost do sada je obvezno
@@ -2961,7 +2975,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Stopa ( % )
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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)
@@ -2984,6 +2998,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,rad pl
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Količina ukupne emisije / Prijevoz {0} u Industrijska Zahtjev {1} ne može biti veća od tražene količine {2} {3} za artikl
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletteri
 DocType: Address,Shipping,Transport
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Stupanje
@@ -3003,7 +3018,6 @@ DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka perioda trenutne Reda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Make Ponuda Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,U tijeku pregled
@@ -3048,6 +3062,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajna imovina
+,Cash Flow,Priliv novca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Period aplikacija ne može biti na dva alocation Records
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani )
@@ -3085,7 +3100,7 @@ DocType: Workstation,per hour,na sat
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto za skladište (stalni inventar) stvorit će se na osnovu ovog konta .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 DocType: Company,Distribution,Distribucija
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
@@ -3127,7 +3142,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavljanje dolazni poslužitelj za podršku e-mail ID . ( npr. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakovanje Slips za pakete dostaviti. Koristi se za obavijesti paket broja, sadržaj paket i njegove težine."
@@ -3240,7 +3255,7 @@ DocType: Time Log,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
 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/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primiti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,Receive,Primiti
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
@@ -3343,7 +3358,7 @@ DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
 DocType: Authorization Rule,Based On,Na osnovu
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,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 +163,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
@@ -3463,7 +3478,7 @@ 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/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
@@ -3479,7 +3494,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3545,7 +3560,7 @@ DocType: Account,Parent Account,Roditelj račun
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Čvor
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
@@ -3570,7 +3585,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch zaliha
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
@@ -3657,7 +3672,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,N
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (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 +565,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Purchase Order,Customer Contact,Client Contacte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,De Sol·licituds de materials
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,De Sol·licituds de materials
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Llet
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utilitza aquesta opció per mantenir el codi de l'article del client i incloure'l en les cerques en base al seu codi
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostra variants
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Quantitat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En estoc
@@ -63,7 +63,7 @@ apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Fe
 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 +606,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adreça de correu electrònic
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle n
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleccionla llista de preus
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Seleccionla llista de preus
 DocType: Production Order Operation,Work In Progress,Treball en curs
 DocType: Employee,Holiday List,Llista de vacances
 DocType: Time Log,Time Log,Hora de registre
@@ -215,6 +215,7 @@ DocType: Sales Partner,Reseller,Revenedor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Si us plau entra l'Empresa
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
+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 +203,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
@@ -233,7 +234,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -245,7 +246,7 @@ DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,L'article {0} està cancel·lat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
@@ -308,7 +309,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to customer'
 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 +628,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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"
@@ -382,13 +383,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerent de vendes
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,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 +554,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre de vacances.
 DocType: Material Request Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
@@ -491,7 +492,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de dades de clien
 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 +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.
@@ -519,9 +520,10 @@ DocType: Buying Settings,Supplier Naming By,NOmenament de proveïdors per
 DocType: Activity Type,Default Costing Rate,Taxa d&#39;Incompliment Costea
 DocType: Maintenance Schedule,Maintenance Schedule,Programa de manteniment
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
+apps/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/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Des rebut de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Des rebut de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
@@ -800,7 +802,8 @@ DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establir Import Pa
 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 +626,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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
@@ -821,7 +824,7 @@ 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/public/js/setup_wizard.js +112,Attach Your Picture,Adjunta la teva imatge
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +3,My Cart,Carro de la compra
@@ -843,10 +846,10 @@ DocType: Packing Slip Item,Packing Slip Item,Albarà d'article
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +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 +550,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Descompte
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Descompte
 DocType: Features Setup,Purchase Discounts,Compra Descomptes
 DocType: Workstation,Wages,Salari
 DocType: Time Log,Will be updated only if Time Log is 'Billable',S&#39;actualitza només si Hora de registre és &quot;facturable&quot;
@@ -913,6 +916,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 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 +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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.
@@ -1053,7 +1057,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista de lliurament és menor que la data d&#39;inici prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
@@ -1125,6 +1129,7 @@ DocType: Sales Order Item,Planned Quantity,Quantitat planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles
 DocType: Item,Maintain Stock,Mantenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1136,7 +1141,7 @@ 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 +471,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1185,7 +1190,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
 DocType: Item,Inventory,Inventari
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar &quot;Punt de Venda&quot; vista
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
 DocType: Item,Sales Details,Detalls de venda
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Quantitat
@@ -1204,6 +1209,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,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
 DocType: Material Request Item,Sales Order No,Ordre de Venda No
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
@@ -1216,7 +1222,7 @@ DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Grup de Clients> Territori
@@ -1266,7 +1272,7 @@ DocType: Production Planning Tool,Select Sales Orders,Seleccionar comandes de cl
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per realitzar un seguiment d'elements mitjançant codi de barres. Vostè serà capaç d'entrar en els elements de la nota de lliurament i la factura de venda mitjançant l'escaneig de codi de barres de l'article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar com Lliurat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Marcar com Lliurat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Fer Cita
 DocType: Dependent Task,Dependent Task,Tasca dependent
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,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}
@@ -1276,7 +1282,8 @@ DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 DocType: SMS Center,Receiver List,Llista de receptors
 DocType: Payment Tool Detail,Payment Amount,Quantitat de pagament
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Veure
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Veure
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,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 +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
@@ -1313,6 +1320,7 @@ DocType: Payment Reconciliation,Payments,Pagaments
 DocType: Budget Detail,Budget Allocated,Pressupost assignat
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
 ,Customer Credit Balance,Saldo de crèdit al Client
+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 +53,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
@@ -1360,7 +1368,7 @@ DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 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,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Seleccioneu {0} primer.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Seleccioneu {0} primer.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
@@ -1394,7 +1402,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,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 +129,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
@@ -1419,7 +1427,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-savi Nivell d
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registre de temps per a les tasques.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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ó
@@ -1527,7 +1535,7 @@ DocType: Appraisal,For Employee Name,Per Nom de l'Empleat
 DocType: Holiday List,Clear Table,Taula en blanc
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,De l'Ordre de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,De l'Ordre de Compra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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
@@ -1767,13 +1775,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 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 +576,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transferir material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
 DocType: Installation Note,Installation Note,Nota d'instal·lació
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Afegir Impostos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flux de caixa de finançament
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
@@ -1816,6 +1825,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de Pagament
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Si us plau, assegureu-vos que realment voleu esborrar totes les transaccions d&#39;aquesta empresa. Les seves dades mestres romandran tal com és. Aquesta acció no es pot desfer."
@@ -2148,7 +2158,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
@@ -2200,7 +2210,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Expense Claim,Expense Approver,Aprovador de despeses
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
@@ -2247,7 +2257,7 @@ DocType: Target Detail,Target Detail,Detall Target
 DocType: Sales Order,% of materials billed against this Sales Order,% de materials facturats d'aquesta Ordre de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrada de Tancament de Període
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciació
+DocType: Account,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
 DocType: Customer,Credit Limit,Límit de Crèdit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccioneu el tipus de transacció
@@ -2272,6 +2282,7 @@ DocType: Quality Inspection,Outgoing,Extravertida
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Efectiu net d&#39;inversió
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Compte root no es pot esborrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Imatges d'entrades
 ,Is Primary Address,És Direcció Primària
@@ -2409,9 +2420,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Monto Vouc
 DocType: Time Log,Batched for Billing,Agrupat per a la Facturació
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
 DocType: POS Profile,Write Off Account,Escriu Off Compte
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Efectiu net de les operacions
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
@@ -2588,7 +2599,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 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 +580,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 DocType: Hub Settings,Access Token,Token d'accés
@@ -2608,6 +2619,7 @@ DocType: Purchase Invoice Item,Image View,Veure imatges
 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 +544,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
@@ -2615,6 +2627,7 @@ DocType: Tax Rule,Shipping City,Enviaments City
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flux de caixa operatiu
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
@@ -2656,7 +2669,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
 Stock Reconciliació"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferència de material a proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Transferència de material a proveïdor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotització
@@ -2668,7 +2681,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materi
 DocType: Features Setup,Point of Sale,Punt de Venda
 DocType: Account,Tax,Impost
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,De Bundle Producte
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
 DocType: Quality Inspection,Report Date,Data de l'informe
 DocType: C-Form,Invoices,Factures
@@ -2683,6 +2696,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Grup de Clients
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: Item,Website Description,Descripció del lloc web
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Canvi en el Patrimoni Net
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
 ,Sales Register,Registre de vendes
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
@@ -2694,7 +2708,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Item,Attributes,Atributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtenir elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtenir elements
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Darrera Data de comanda
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Feu Factura impostos especials
@@ -2744,7 +2758,7 @@ DocType: Quality Inspection,Delivery Note No,Número d'albarà de lliurament
 DocType: Company,Retail,Venda al detall
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El client {0} no existeix
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
 DocType: Upload Attendance,Download Template,Descarregar plantilla
@@ -2772,7 +2786,7 @@ DocType: Sales Invoice,Product Bundle Help,Producte Bundle Ajuda
 ,Monthly Attendance Sheet,Full d'Assistència Mensual
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No s'ha trobat registre
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Obtenir elements del paquet del producte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Compte {0} està inactiu
 DocType: GL Entry,Is Advance,És Avanç
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Assistència Des de la data i Assistència a la data és obligatori
@@ -2963,7 +2977,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Tarifa (%)
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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)
@@ -2986,6 +3000,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Trebal
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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 Sol·licitud de material {1} no pot ser superior a la quantitat sol·licitada {2} d&#39;article {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Butlletins
 DocType: Address,Shipping,Enviament
 DocType: Stock Ledger Entry,Stock Ledger Entry,Ledger entrada Stock
@@ -3005,7 +3020,6 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de finalització del període de l'ordre actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Fer una Oferta Carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorn
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
 DocType: Project Task,Pending Review,Pendent de Revisió
@@ -3050,6 +3064,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Següent Contacte
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actius Fixos
+,Cash Flow,Flux d&#39;Efectiu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
 DocType: Item Group,Default Expense Account,Compte de Despeses predeterminat
 DocType: Employee,Notice (days),Avís (dies)
@@ -3087,7 +3102,7 @@ DocType: Workstation,per hour,per hores
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Es crearà un Compte per al magatzem (Inventari Permanent) en aquest Compte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 DocType: Company,Distribution,Distribució
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Quantitat pagada
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Quantitat pagada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
@@ -3129,7 +3144,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuració del servidor d'entrada per l'id de suport per correu electrònic. (Per exemple support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,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 +570,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
 apps/erpnext/erpnext/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."
@@ -3242,7 +3257,7 @@ DocType: Time Log,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
 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/buying/doctype/purchase_order/purchase_order.js +597,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,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ó
@@ -3346,7 +3361,7 @@ DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vende
 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 +580,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,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 +163,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitat del projecte / tasca.
@@ -3466,7 +3481,7 @@ 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/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Canvi
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 DocType: Appraisal Goal,Score Earned,Score Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
@@ -3482,7 +3497,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,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 +563,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}
@@ -3548,7 +3563,7 @@ DocType: Account,Parent Account,Compte primària
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
@@ -3573,7 +3588,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inventari de lots
 DocType: Employee,Contract End Date,Data de finalització de contracte
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Ordres de venda i halar (pendent d'entregar) basat en els criteris anteriors
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Oferta de Proveïdor
 DocType: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
 DocType: Pricing Rule,Min Qty,Quantitat mínima
@@ -3660,7 +3675,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,N
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (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 +565,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Zobrazit Varianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
@@ -63,7 +63,7 @@ apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Pr
 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 +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek č. {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Prosím, vyberte Ceník"
 DocType: Production Order Operation,Work In Progress,Work in Progress
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
@@ -215,6 +215,7 @@ DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Prosím, zadejte společnost"
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
+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 +203,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -233,7 +234,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -245,7 +246,7 @@ DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Položka {0} je zrušen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
@@ -308,7 +309,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to customer'
 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 +628,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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"
@@ -382,13 +383,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales manažer ve
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,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 +554,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -491,7 +492,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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."
@@ -519,9 +520,10 @@ DocType: Buying Settings,Supplier Naming By,Dodavatel Pojmenování By
 DocType: Activity Type,Default Costing Rate,Výchozí kalkulace Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
+apps/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/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z příjemky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Z příjemky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno na"" a ""Seskupeno podle"", nemůže být stejné"
@@ -800,7 +802,8 @@ DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Částka platb
 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 +626,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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
@@ -821,7 +824,7 @@ 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/public/js/setup_wizard.js +112,Attach Your Picture,Připojit svůj obrázek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Dělat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +3,My Cart,Můj košík
@@ -843,10 +846,10 @@ DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +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 +550,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bude aktualizována pouze v případě, Time Log je &quot;Zúčtovatelná&quot;"
@@ -913,6 +916,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 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 +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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.
@@ -1053,7 +1057,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekávané datum dodání je menší než plánované datum zahájení.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
@@ -1125,6 +1129,7 @@ DocType: Sales Order Item,Planned Quantity,Plánované Množství
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržovat Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1136,7 +1141,7 @@ 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 +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1185,7 +1190,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Chcete-li povolit &quot;Point of Sale&quot; pohledu
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
@@ -1204,6 +1209,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,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
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
@@ -1216,7 +1222,7 @@ DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
@@ -1266,7 +1272,7 @@ DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objedná
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označit jako Dodává
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Označit jako Dodává
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Vytvořit nabídku
 DocType: Dependent Task,Dependent Task,Závislý Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,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}"
@@ -1276,7 +1282,8 @@ DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
 DocType: Payment Tool Detail,Payment Amount,Částka platby
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobrazit
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Zobrazit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,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 +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
@@ -1313,6 +1320,7 @@ DocType: Payment Reconciliation,Payments,Platby
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
+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 +53,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
@@ -1360,7 +1368,7 @@ DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
 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,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Prosím, vyberte {0} jako první."
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1394,7 +1402,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Dovolená proplacena?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1419,7 +1427,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Se
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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í
@@ -1527,7 +1535,7 @@ DocType: Appraisal,For Employee Name,Pro jméno zaměstnance
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktura č
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Z vydané objednávky
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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
@@ -1767,13 +1775,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 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 +576,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
 DocType: Installation Note,Installation Note,Poznámka k instalaci
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Přidejte daně
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Peněžní tok z finanční
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
@@ -1816,6 +1825,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Ujistěte se, že opravdu chcete vymazat všechny transakce pro tuto společnost. Vaše kmenová data zůstanou, jak to je. Tuto akci nelze vrátit zpět."
@@ -2148,7 +2158,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
@@ -2200,7 +2210,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Platit
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Platit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
@@ -2247,7 +2257,7 @@ DocType: Target Detail,Target Detail,Target Detail
 DocType: Sales Order,% of materials billed against this Sales Order,% materiálů fakturovaných proti této prodejní obědnávce
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
+DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
@@ -2272,6 +2282,7 @@ DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
+apps/erpnext/erpnext/accounts/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 +176,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavní adresa
@@ -2409,9 +2420,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Vou
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Čistý peněžní tok z provozní
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,např. DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
@@ -2587,7 +2598,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 konflikt přiřazením prioritu. Cena Pravidla: {0}"
 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 +580,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
 DocType: Hub Settings,Access Token,Přístupový Token
@@ -2607,6 +2618,7 @@ DocType: Purchase Invoice Item,Image View,Image View
 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 +544,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
@@ -2614,6 +2626,7 @@ DocType: Tax Rule,Shipping City,Přepravní City
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow z provozních činností
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
 DocType: Journal Entry,Print Heading,Tisk záhlaví
@@ -2655,7 +2668,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hodina
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
 pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Přeneste materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Přeneste materiál Dodavateli
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ leadu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvořit Citace
@@ -2667,7 +2680,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle zboží
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Od Bundle zboží
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
 DocType: C-Form,Invoices,Faktury
@@ -2682,6 +2695,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Zákazník Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Čistá změna ve vlastním kapitálu
 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
@@ -2693,7 +2707,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atributy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Získat položky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Datum poslední objednávky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
@@ -2743,7 +2757,7 @@ DocType: Quality Inspection,Delivery Note No,Dodacího listu
 DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
@@ -2771,7 +2785,7 @@ DocType: Sales Invoice,Product Bundle Help,Product Bundle Help
 ,Monthly Attendance Sheet,Měsíční Účast Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Získat předměty z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Získat předměty z Bundle Product
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
@@ -2962,7 +2976,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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)
@@ -2985,6 +2999,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Množství celkové emisi / přenosu {0} v hmotné Request {1} nemůže být větší než množství požadovaná v {2} pro položku {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Zpravodaje
 DocType: Address,Shipping,Lodní
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
@@ -3004,7 +3019,6 @@ DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvořte nabídku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zpáteční
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
@@ -3049,6 +3063,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Následující Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+,Cash Flow,Tok peněz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Období pro podávání žádostí nemůže být na dvou alokace záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
 DocType: Employee,Notice (days),Oznámení (dny)
@@ -3086,7 +3101,7 @@ DocType: Workstation,per hour,za hodinu
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
@@ -3128,7 +3143,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Salary Slip,Salary Slip,Plat Slip
 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."
@@ -3241,7 +3256,7 @@ DocType: Time Log,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
 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/buying/doctype/purchase_order/purchase_order.js +597,Receive,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,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
@@ -3345,7 +3360,7 @@ DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Závěrečný účet {0} musí být typu odpovědnosti / Equity
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,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 +163,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
@@ -3465,7 +3480,7 @@ 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/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Změna
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Změna
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","např ""My Company LLC """
@@ -3481,7 +3496,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3547,7 +3562,7 @@ DocType: Account,Parent Account,Nadřazený účet
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
@@ -3572,7 +3587,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Z nabídky dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Z nabídky dodavatele
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
@@ -3659,7 +3674,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,N
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (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 +565,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -17,7 +17,7 @@ DocType: Sales Partner,Dealer,Forhandler
 DocType: Employee,Rented,Lejet
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
@@ -48,7 +48,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,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
@@ -58,7 +58,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already as
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
@@ -67,7 +67,7 @@ DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/public/js/pos/pos.js +534,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
@@ -215,7 +215,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,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
@@ -227,7 +227,7 @@ 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 +596,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Vare {0} er aflyst
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
@@ -282,7 +282,7 @@ apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
 DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
@@ -353,7 +353,7 @@ DocType: Sales Order,Not Applicable,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,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
@@ -470,7 +470,7 @@ DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
 DocType: Employee,Passport Number,Passport Number
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Fra kvittering
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
@@ -717,7 +717,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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
@@ -737,7 +737,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Lave
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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}
@@ -759,7 +759,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
 DocType: Delivery Note,Delivery To,Levering Til
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
+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;"
@@ -948,7 +948,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated perc
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
 DocType: Appraisal Goal,Goal,Goal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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
@@ -1026,7 +1026,7 @@ DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1068,7 +1068,7 @@ DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working H
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+apps/erpnext/erpnext/public/js/pos/pos.js +408,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
@@ -1099,7 +1099,7 @@ DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
@@ -1155,7 +1155,7 @@ DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 DocType: SMS Center,Receiver List,Modtager liste
 DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,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
@@ -1228,7 +1228,7 @@ DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,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
@@ -1259,7 +1259,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1383,7 +1383,7 @@ DocType: Appraisal,For Employee Name,For Medarbejder Navn
 DocType: Holiday List,Clear Table,Klar Table
 DocType: Features Setup,Brands,Mærker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Fra indkøbsordre
 DocType: Activity Cost,Costing Rate,Costing Rate
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
@@ -1605,7 +1605,7 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,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
@@ -1930,7 +1930,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
@@ -1979,7 +1979,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
@@ -2023,7 +2023,7 @@ DocType: Target Detail,Target Detail,Target Detail
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+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: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
@@ -2173,7 +2173,6 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Be
 DocType: Time Log,Batched for Billing,Batched for fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,fx moms
@@ -2337,7 +2336,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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
@@ -2400,7 +2399,7 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
@@ -2433,7 +2432,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Få Varer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
@@ -2476,7 +2475,7 @@ DocType: Quality Inspection,Delivery Note No,Levering Note Nej
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,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
@@ -2675,7 +2674,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_cal
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Sats (%)
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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)
@@ -2788,7 +2787,7 @@ DocType: Workstation,per hour,per time
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+apps/erpnext/erpnext/public/js/pos/pos.js +428,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}%
@@ -3123,7 +3122,7 @@ DocType: Company,Round Off Account,Afrunde konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
@@ -3195,7 +3194,7 @@ DocType: Account,Parent Account,Parent Konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/public/js/pos/pos.js +96,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;
@@ -3216,7 +3215,7 @@ DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
 DocType: Employee,Contract End Date,Kontrakt Slutdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
@@ -3296,7 +3295,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,D
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,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
@@ -63,7 +63,7 @@ apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Fo
 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 +606,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/public/js/pos/pos.js +534,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
@@ -214,6 +214,7 @@ DocType: Sales Partner,Reseller,Forhandler
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
 ,Production Orders in Progress,Produktionsordrer i Progress
+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 +203,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
@@ -232,7 +233,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,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
@@ -244,7 +245,7 @@ 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 +596,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Vare {0} er aflyst
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
@@ -307,7 +308,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to customer'
 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 +628,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Select Item,Vælg Item
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
@@ -380,13 +381,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manag
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +554,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,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
@@ -486,7 +487,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
 DocType: Quotation,Quotation To,Citat Til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.
@@ -514,9 +515,10 @@ DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
 DocType: Activity Type,Default Costing Rate,Standard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
+apps/erpnext/erpnext/accounts/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/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Fra kvittering
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
@@ -776,7 +778,8 @@ DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Belø
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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
@@ -797,7 +800,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Lave
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +3,My Cart,Indkøbskurv
@@ -819,10 +822,10 @@ 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Rabat
+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;"
@@ -889,6 +892,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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.
@@ -1029,7 +1033,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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
@@ -1101,6 +1105,7 @@ 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 +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1112,7 +1117,7 @@ DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1160,7 +1165,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
 DocType: Features Setup,"To enable ""Point of Sale"" view",For at aktivere &quot;Point of Sale&quot; view
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+apps/erpnext/erpnext/public/js/pos/pos.js +408,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
@@ -1179,6 +1184,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/accounts/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
 DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
 DocType: Item Group,Item Group Name,Item Group Name
@@ -1191,7 +1197,7 @@ DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
@@ -1241,7 +1247,7 @@ DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markér som Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Markér som Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,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}
@@ -1251,7 +1257,8 @@ DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 DocType: SMS Center,Receiver List,Modtager liste
 DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Vis
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,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 +335,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
@@ -1288,6 +1295,7 @@ DocType: Payment Reconciliation,Payments,Betalinger
 DocType: Budget Detail,Budget Allocated,Budgettet
 DocType: Journal Entry,Entry Type,Posttype
 ,Customer Credit Balance,Customer Credit Balance
+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 +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
@@ -1335,7 +1343,7 @@ DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Vælg {0} først.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1369,7 +1377,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1394,7 +1402,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarrang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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
@@ -1501,7 +1509,7 @@ DocType: Appraisal,For Employee Name,For Medarbejder Navn
 DocType: Holiday List,Clear Table,Klar Table
 DocType: Features Setup,Brands,Mærker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Fra indkøbsordre
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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
@@ -1741,13 +1749,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,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 +301,Add Taxes,Tilføj Skatter
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Pengestrømme fra finansieringsaktivitet
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskab
@@ -1790,6 +1799,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
@@ -2089,7 +2099,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
@@ -2141,7 +2151,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
@@ -2188,7 +2198,7 @@ DocType: Target Detail,Target Detail,Target Detail
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+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: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
@@ -2213,6 +2223,7 @@ 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/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Netto kontant fra Investering
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-konto kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
 ,Is Primary Address,Er primære adresse
@@ -2350,9 +2361,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Be
 DocType: Time Log,Batched for Billing,Batched for fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Netto kontant fra Operations
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,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
@@ -2526,7 +2537,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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
@@ -2546,6 +2557,7 @@ 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
+apps/erpnext/erpnext/stock/doctype/item/item.py +544,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
@@ -2553,6 +2565,7 @@ DocType: Tax Rule,Shipping City,Forsendelse By
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,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/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Pengestrøm fra driften
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
 DocType: Journal Entry,Print Heading,Print Overskrift
@@ -2593,7 +2606,7 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
@@ -2605,7 +2618,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskif
 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}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Fra produktpakke
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Fra produktpakke
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
 DocType: Quality Inspection,Report Date,Report Date
 DocType: C-Form,Invoices,Fakturaer
@@ -2620,6 +2633,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Customer Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: Item,Website Description,Website Beskrivelse
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoændring i Equity
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
@@ -2631,7 +2645,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Få Varer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
@@ -2681,7 +2695,7 @@ DocType: Quality Inspection,Delivery Note No,Levering Note Nej
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
@@ -2709,7 +2723,7 @@ DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
 ,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få elementer fra Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Få elementer fra Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
@@ -2899,7 +2913,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Sats (%)
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostninger
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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)
@@ -2922,6 +2936,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
 DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Samlede Udstedelse / Transfer mængde på {0} i Material Request {1} kan ikke være større end anmodet mængde {2} til konto {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Nyhedsbreve
 DocType: Address,Shipping,Forsendelse
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
@@ -2941,7 +2956,6 @@ DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Afventer anmeldelse
@@ -2986,6 +3000,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Næste Kontakt
 DocType: Employee,Employment Type,Beskæftigelse type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+,Cash Flow,Penge strøm
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Ansøgningsperiode kan ikke være på tværs af to alocation optegnelser
 DocType: Item Group,Default Expense Account,Standard udgiftskonto
 DocType: Employee,Notice (days),Varsel (dage)
@@ -3023,7 +3038,7 @@ DocType: Workstation,per hour,per time
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+apps/erpnext/erpnext/public/js/pos/pos.js +428,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}%
@@ -3065,7 +3080,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 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."
@@ -3167,7 +3182,7 @@ 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Modtag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,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
@@ -3271,7 +3286,7 @@ DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukning konto {0} skal være af typen Ansvar / Equity
 DocType: Authorization Rule,Based On,Baseret på
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +580,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
@@ -3390,7 +3405,7 @@ DocType: Company,Round Off Account,Afrunde konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
@@ -3406,7 +3421,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3472,7 +3487,7 @@ DocType: Account,Parent Account,Parent Konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/public/js/pos/pos.js +96,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;
@@ -3497,7 +3512,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,Kontrakt Slutdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
@@ -3584,7 +3599,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,D
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
 DocType: Purchase Order,Customer Contact,Kundenkontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Von Materialanfrage
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Von Materialanfrage
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Baumstruktur
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Keine weiteren Ergebnisse.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"Diese Option wird verwendet, um die kundenspezifische Artikelnummer zu erhalten und den Artikel aufgrund der Artikelnummer auffindbar zu machen"
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Varianten anzeigen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Menge
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
 DocType: Employee Education,Year of Passing,Jahr des Abgangs
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Auf Lager
@@ -63,7 +63,7 @@ apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Ne
 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 +606,Invoice,Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Mail-Addresse
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Zeile # {0}:
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Bitte eine Preisliste auswählen
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Bitte eine Preisliste auswählen
 DocType: Production Order Operation,Work In Progress,Laufende Arbeit/-en
 DocType: Employee,Holiday List,Urlaubsübersicht
 DocType: Time Log,Time Log,Zeitprotokoll
@@ -214,6 +214,7 @@ DocType: Sales Partner,Reseller,Wiederverkäufer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Bitte Firmenname angeben
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Cashflow aus Finanzierungs
 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 +203,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
@@ -232,7 +233,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
@@ -244,7 +245,7 @@ DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Artikel {0} wird storniert
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
 DocType: Item,Purchase Details,Einkaufsdetails
@@ -269,7 +270,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,P
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 Zeichen
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
-apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitätskosten je Beschäftigten
+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/config/crm.py +90,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
@@ -306,8 +307,8 @@ apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat
 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 für Arbeitnehmer zugeteilt {1} für die Periode {2} auf {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Artikel auswählen
+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 die Periode {2} bis {3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +262,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
@@ -380,13 +381,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Hauptvertriebslei
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +554,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Stammdaten zum Urlaub
 DocType: Material Request Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,Bitte die Artikelnummer eingeben
 DocType: BOM,Costing,Kalkulation
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in den Druckkosten enthalten erachtet."
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
@@ -488,7 +489,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundendatenbank
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.
@@ -516,9 +517,10 @@ DocType: Buying Settings,Supplier Naming By,Bezeichnung des Lieferanten nach
 DocType: Activity Type,Default Costing Rate,Standardkosten
 DocType: Maintenance Schedule,Maintenance Schedule,Wartungsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettoveränderung in der Bestands
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leiter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Von Kaufbeleg
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Von Kaufbeleg
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""basierend auf"" und ""guppiert nach"" können nicht gleich sein"
@@ -797,7 +799,8 @@ DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag
 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 +626,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,Select Item for Transfer,Artikel für Übertrag auswählen
+DocType: Purchase Invoice,Additional Discount Percentage,Zusätzliche Rabatt Prozent
 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"
@@ -818,7 +821,7 @@ 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/public/js/setup_wizard.js +112,Attach Your Picture,Eigenes Bild anhängen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Erstellen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +3,My Cart,Mein Warenkorb
@@ -840,10 +843,10 @@ DocType: Packing Slip Item,Packing Slip Item,Position auf dem Packzettel
 DocType: POS Profile,Cash/Bank Account,Kassen-/Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +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 +550,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Einkaufsrabatte
 DocType: Workstation,Wages,Lohn
 DocType: Time Log,Will be updated only if Time Log is 'Billable',"Wird nur dann aktualisiert, wenn das Zeitprotokoll ""abrechenbar"" ist"
@@ -910,6 +913,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 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 +209,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 +881,Please set 'Apply Additional Discount On',Bitte stellen Sie auf &quot;Übernehmen Zusätzliche Discount On &#39;
 ,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."
@@ -917,7 +921,7 @@ DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Dieser Zeitprotokollstapel wurde abgerechnet.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Vertriebs-Chance erstellen
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opportunity erstellen
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
 DocType: Supplier,Communications,Kommunikationswesen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Fehler in der Kapazitätsplanung
@@ -938,7 +942,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blau
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
 DocType: Price List Country,Price List Country,Preisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Weitere Knoten können nur unter Knoten vom Typ ""Gruppe"" erstellt werden"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Bitte stellen Sie E-Mail ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,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
@@ -1030,7 +1034,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mand
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
 apps/erpnext/erpnext/public/js/setup_wizard.js +365,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +112,Website Image should be a public file or website URL,Website Bild sollte eine öffentliche Datei oder Website-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,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
@@ -1050,7 +1054,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Summe Auslieferungen
@@ -1122,6 +1126,7 @@ DocType: Sales Order Item,Planned Quantity,Geplante Menge
 DocType: Purchase Invoice Item,Item Tax Amount,Artikelsteuerbetrag
 DocType: Item,Maintain Stock,Lager verwalten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,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 Anlagevermögen
 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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
@@ -1133,7 +1138,7 @@ 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 +471,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,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
@@ -1181,7 +1186,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
 DocType: Item,Inventory,Lagerbestand
 DocType: Features Setup,"To enable ""Point of Sale"" view","Um die ""Point of Sale""-Ansicht zu aktivieren"
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
 DocType: Item,Sales Details,Verkaufsdetails
 DocType: Opportunity,With Items,Mit Artikeln
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Menge
@@ -1200,6 +1205,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packzettel storniert
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Der Cashflow aus Investitions
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr.
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
@@ -1212,7 +1218,7 @@ DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fehler: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Fehler: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde > Kundengruppe > Region
@@ -1262,7 +1268,7 @@ DocType: Production Planning Tool,Select Sales Orders,Kundenaufträge auswähle
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikel-Barcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Als geliefert kennzeichnen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Als geliefert kennzeichnen
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Angebot erstellen
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
@@ -1272,7 +1278,8 @@ DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 DocType: SMS Center,Receiver List,Empfängerliste
 DocType: Payment Tool Detail,Payment Amount,Zahlungsbetrag
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} anzeigen
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} anzeigen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Nettoveränderung der flüssigen
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
@@ -1297,7 +1304,7 @@ DocType: Party Account,Party Account,Gruppenkonto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
 DocType: Journal Entry Account,Debit in Company Currency,Soll in Unternehmenswährung
-apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meine Fragen
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meine Fälle
 DocType: BOM Item,BOM Item,Stücklisten-Artikel
 DocType: Appraisal,For Employee,Für Mitarbeiter
 DocType: Company,Default Values,Standardwerte
@@ -1309,6 +1316,7 @@ DocType: Payment Reconciliation,Payments,Zahlungen
 DocType: Budget Detail,Budget Allocated,Zugewiesenes Budget
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinien
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettoänderung in der Kreditorenbuchhaltung
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bitte E-Mail-ID überprüfen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt"""
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
@@ -1356,7 +1364,7 @@ DocType: Upload Attendance,Get Template,Vorlage aufrufen
 DocType: Address,Postal,Post
 DocType: Item,Weightage,Gewichtung
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Bitte zuerst {0} auswählen.
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Bitte zuerst {0} auswählen.
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesewert 2
@@ -1390,7 +1398,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Opportunity von"" ist zwingend erforderlich"
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,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
@@ -1415,7 +1423,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Anwenden des lagerbezogenen Mel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Zeitprotokoll für Aufgaben
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Bezahlung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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
@@ -1454,7 +1462,7 @@ DocType: Serial No,Creation Date,Erstellungsdatum
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikel {0} erscheint mehrfach in Preisliste {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwenden auf"" ausgewählt ist bei {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Lieferantenangebotsposition
-DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiviert die Erstellung von Zeitprotokolle gegen Fertigungsaufträge. Operationen werden nicht auf Fertigungsauftrag verfolgt werden
+DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiviert die Erstellung von Zeitprotokollen zu Fertigungsaufträgen. Arbeitsgänge werden nicht zu Fertigungsaufträgen nachverfolgt
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gehaltsübersicht erstellen
 DocType: Item,Has Variants,Hat Varianten
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Auf ""Ausgangsrechnung erstellen"" klicken, um eine neue Ausgangsrechnung zu erstellen."
@@ -1522,7 +1530,7 @@ DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name
 DocType: Holiday List,Clear Table,Tabelle leeren
 DocType: Features Setup,Brands,Marken
 DocType: C-Form Invoice Detail,Invoice No,Rechnungs-Nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Von Lieferantenauftrag
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Von Lieferantenauftrag
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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
@@ -1762,13 +1770,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 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 +576,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Material übergeben
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
 DocType: Installation Note,Installation Note,Installationshinweis
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Steuern hinzufügen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Der Cashflow aus Finanzierungs
 ,Financial Analytics,Finanzanalyse
 DocType: Quality Inspection,Verified By,Geprüft durch
 DocType: Address,Subsidiary,Tochtergesellschaft
@@ -1811,6 +1820,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Tool,Payment Account,Zahlungskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Net Verä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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Bitte sicher stellen, dass wirklich alle Transaktionen für diese Firma gelöscht werden sollen. Die Stammdaten bleiben bestehen. Diese Aktion kann nicht rückgängig gemacht werden."
@@ -1956,7 +1966,7 @@ DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
 DocType: Employee,Emergency Contact,Notfallkontakt
 DocType: Item,Quality Parameters,Qualitätsparameter
-apps/erpnext/erpnext/stock/doctype/item/item.js +26,Ledger,Sachkonto
+apps/erpnext/erpnext/stock/doctype/item/item.js +26,Ledger,Hauptbuch
 DocType: Target Detail,Target  Amount,Zielbetrag
 DocType: Shopping Cart Settings,Shopping Cart Settings,Warenkorb-Einstellungen
 DocType: Journal Entry,Accounting Entries,Buchungen
@@ -2142,7 +2152,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
 DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
@@ -2194,7 +2204,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Expense Claim,Expense Approver,Ausgabenbewilliger
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zahlen
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Zahlen
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Bis Datum und Uhrzeit
 DocType: SMS Settings,SMS Gateway URL,SMS-Gateway-URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
@@ -2241,7 +2251,7 @@ DocType: Target Detail,Target Detail,Zieldetail
 DocType: Sales Order,% of materials billed against this Sales Order,% der für diesen Kundenauftrag in Rechnung gestellten Materialien
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periodenabschlussbuchung
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenstelle mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Abschreibung
+DocType: Account,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
 DocType: Customer,Credit Limit,Kreditlimit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Bitte Transaktionstyp auswählen
@@ -2266,6 +2276,7 @@ DocType: Quality Inspection,Outgoing,Ausgang
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Cashflow aus Investitions
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Lagerbuchungen anzeigen
 ,Is Primary Address,Ist Hauptadresse
@@ -2342,7 +2353,7 @@ DocType: Workstation Working Hour,Start Time,Startzeit
 DocType: Item Price,Bulk Import Help,Massen-Import Hilfe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Menge wählen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige, auf die die Regel anzuwenden ist"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Bericht
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mitteilung gesendet
 DocType: Production Plan Sales Order,SO Date,Auftragsdatum
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
@@ -2403,9 +2414,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Einstandskosten
 DocType: Time Log,Batched for Billing,Für Abrechnung gebündelt
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rechnungen von Lieferanten
 DocType: POS Profile,Write Off Account,Abschreibungs-Konto
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbetrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
 DocType: Item,Warranty Period (in days),Garantiefrist (in Tagen)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Net Mittelzufluss aus laufender Geschäftstätigkeit
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,z. B. Mehrwertsteuer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Position 4
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
@@ -2579,7 +2590,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 			conflict by assigning priority. Price Rules: {0}",Es existieren mehrere Preisregeln mit denselben Kriterien. Bitte diesen Konflikt durch Vergabe von Vorrangregelungen lösen. Preisregeln: {0}
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Material ausgeben
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
 DocType: Hub Settings,Access Token,Zugriffstoken
@@ -2599,6 +2610,7 @@ DocType: Purchase Invoice Item,Image View,Bildansicht
 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 +544,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variant &#39;{0}&#39; ist dieselbe wie in der Vorlage sein &#39;{1}&#39;
 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
@@ -2606,6 +2618,7 @@ DocType: Tax Rule,Shipping City,Zielstadt der Lieferung
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dieser Artikel ist eine Variante von {0} (Vorlage). Attribute werden von der Vorlage übernommen, ausser es wurde ""Nicht kopieren"" ausgewählt."
 DocType: Account,Purchase User,Nutzer Einkauf
 DocType: Notification Control,Customize the Notification,Mitteilungstext anpassen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cashflow aus betrieblicher Tätigkeit
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
 DocType: Sales Invoice,Shipping Rule,Versandregel
 DocType: Journal Entry,Print Heading,Druckkopf
@@ -2646,7 +2659,7 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Stunde
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Material dem Lieferanten übergeben
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Material dem Lieferanten übergeben
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
 DocType: Lead,Lead Type,Lead-Typ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Angebot erstellen
@@ -2658,7 +2671,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nac
 DocType: Features Setup,Point of Sale,POS (Point of Sale)
 DocType: Account,Tax,Steuer
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Zeile {0}: {1} ist keine gültige {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Aus Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Aus Produkt-Bundle
 DocType: Production Planning Tool,Production Planning Tool,Werkzeug zur Fertigungsplanung
 DocType: Quality Inspection,Report Date,Berichtsdatum
 DocType: C-Form,Invoices,Rechnungen
@@ -2673,6 +2686,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Kundengruppe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: Item,Website Description,Webseiten-Beschreibung
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Net Veränderung des Eigenkapitals
 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
@@ -2684,7 +2698,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
 DocType: Item,Attributes,Attribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Artikel aufrufen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Artikel aufrufen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Letztes Bestelldatum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Verbrauchssteuerrechnung erstellen
@@ -2734,7 +2748,7 @@ DocType: Quality Inspection,Delivery Note No,Lieferschein-Nummer
 DocType: Company,Retail,Einzelhandel
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} existiert nicht
 DocType: Attendance,Absent,Abwesend
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Produkt-Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -abgaben
 DocType: Upload Attendance,Download Template,Vorlage herunterladen
@@ -2762,7 +2776,7 @@ DocType: Sales Invoice,Product Bundle Help,Produkt-Bundle-Hilfe
 ,Monthly Attendance Sheet,Monatliche Anwesenheitsliste
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kein Datensatz gefunden
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} ist inaktiv
 DocType: GL Entry,Is Advance,Ist Vorkasse
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Anwesenheit ab Datum"" und ""Anwesenheit bis Datum"" sind zwingend"
@@ -2952,7 +2966,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Preis (%)
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Enddatum des Geschäftsjahres
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,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
@@ -2975,6 +2989,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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 als die angeforderte Menge ist {2} für Artikel {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletter
 DocType: Address,Shipping,Versand
 DocType: Stock Ledger Entry,Stock Ledger Entry,Buchung im Lagerbuch
@@ -2994,7 +3009,6 @@ DocType: Account,Auditor,Prüfer
 DocType: Purchase Order,End date of current order's period,Schlußdatum der laufenden Bestellperiode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Angebotsschreiben erstellen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
@@ -3039,6 +3053,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Nächster Kontakt
 DocType: Employee,Employment Type,Art der Beschäftigung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlagevermögen
+,Cash Flow,Bargeldumlauf
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Beantragter Zeitraum kann sich nicht über zwei Antragsdatensätze erstrecken
 DocType: Item Group,Default Expense Account,Standardaufwandskonto
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
@@ -3076,7 +3091,7 @@ DocType: Workstation,per hour,pro stunde
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager (Permanente Inventur) wird unter diesem Konto erstellt.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 DocType: Company,Distribution,Großhandel
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zahlbetrag
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Zahlbetrag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
@@ -3118,7 +3133,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),E-Mail-Adresse für den Support einrichten. (z. B. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 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."
@@ -3231,7 +3246,7 @@ DocType: Time Log,Hours,Stunden
 DocType: Project,Expected Start Date,Voraussichtliches Startdatum
 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/buying/doctype/purchase_order/purchase_order.js +597,Receive,Empfangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,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
@@ -3294,7 +3309,7 @@ DocType: Item,Has Serial No,Hat Seriennummer
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Von {0} für {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
-apps/erpnext/erpnext/stock/doctype/item/item.py +105,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} um {1} Artikel angebracht kann nicht gefunden werden
+apps/erpnext/erpnext/stock/doctype/item/item.py +105,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.
@@ -3324,7 +3339,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
-DocType: Leave Block List,Leave Block List Name,Urlaubssperrenliste Name
+DocType: 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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} und das Jahr {1} übertragen
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import-Abonnenten
@@ -3335,7 +3350,7 @@ DocType: Notification Control,Sales Invoice Message,Mitteilung zur Ausgangsrechn
 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 +580,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivität/Aufgabe
@@ -3455,7 +3470,7 @@ 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/setup/setup_wizard/industry_type.py +18,Consulting,Beratung
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ändern
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Ändern
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
@@ -3471,7 +3486,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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
@@ -3537,7 +3552,7 @@ DocType: Account,Parent Account,Übergeordnetes Konto
 DocType: Quality Inspection Reading,Reading 3,Ablesewert 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Expense Claim,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
@@ -3562,7 +3577,7 @@ apps/erpnext/erpnext/config/stock.py +283,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: 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Von Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Von Lieferantenangebot
 DocType: Deduction Type,Deduction Type,Abzugsart
 DocType: Attendance,Half Day,Halbtags
 DocType: Pricing Rule,Min Qty,Mindestmenge
@@ -3649,7 +3664,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,K
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (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 +565,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Stückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -21,7 +21,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Θα υπολογίζεται στη συναλλαγή.
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Από αίτηση υλικού
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Από αίτηση υλικού
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Δέντρο
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Δεν υπάρχουν άλλα αποτελέσματα.
@@ -52,7 +52,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Τρ
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Για να διατηρήσετε τον πελατοκεντρικό κωδικό είδους και να καταστούν προσβάσιμα με βάση τον κωδικό τους, χρησιμοποιήστε αυτή την επιλογή"
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Προβολή παραλλαγών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Ποσότητα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Σε Απόθεμα
@@ -63,7 +63,7 @@ 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 +606,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
@@ -72,7 +72,7 @@ DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Γραμμή # {0}:
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
 DocType: Production Order Operation,Work In Progress,Εργασία σε εξέλιξη
 DocType: Employee,Holiday List,Λίστα αργιών
 DocType: Time Log,Time Log,Αρχείο καταγραφής χρονολογίου
@@ -214,6 +214,7 @@ DocType: Sales Partner,Reseller,Μεταπωλητής
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Παρακαλώ εισάγετε εταιρεία
 DocType: Delivery Note Item,Against Sales Invoice Item,Κατά το είδος στο τιμολόγιο πώλησης
 ,Production Orders in Progress,Εντολές παραγωγής σε εξέλιξη
+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 +203,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
@@ -232,7 +233,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +577,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
@@ -244,7 +245,7 @@ DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγε
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
@@ -307,7 +308,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to customer'
 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 +628,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +262,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
@@ -380,13 +381,13 @@ DocType: Sales Taxes and Charges Template,Sales Master Manager,Διαχειρι
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +554,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Κύρια εγγραφή αργιών.
 DocType: Material Request Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,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,Συνολική ποσότητα
@@ -488,7 +489,7 @@ apps/erpnext/erpnext/config/crm.py +17,Customer database.,Βάση δεδομέ
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +702,Default Unit of Measure for Item {0} cannot be changed directly because 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 +703,Default Unit of Measure for Item {0} cannot be changed directly because 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.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
@@ -516,9 +517,10 @@ DocType: Buying Settings,Supplier Naming By,Ονοματοδοσία προμη
 DocType: Activity Type,Default Costing Rate,Προεπιλογή Κοστολόγηση Τιμή
 DocType: Maintenance Schedule,Maintenance Schedule,Χρονοδιάγραμμα συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Στη συνέχεια, οι κανόνες τιμολόγησης φιλτράρονται με βάση τους πελάτες, την ομάδα πελατών, την περιοχή, τον προμηθευτής, τον τύπο του προμηθευτή, την εκστρατεία, τον συνεργάτη πωλήσεων κ.λ.π."
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Καθαρή Αλλαγή στο Απογραφή
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
 DocType: SMS Settings,Receiver Parameter,Παράμετρος παραλήπτη
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
@@ -797,7 +799,8 @@ 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 +626,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,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,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
@@ -818,7 +821,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Λευκ
 DocType: SMS Center,All Lead (Open),Όλες οι επαφές (ανοιχτές)
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Επισύναψη της εικόνα σας
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Δημιούργησε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Make ,Δημιούργησε
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Υπήρξε ένα σφάλμα. Ένας πιθανός λόγος θα μπορούσε να είναι ότι δεν έχετε αποθηκεύσει τη φόρμα. Παρακαλώ επικοινωνήστε με το support@erpnext.Com εάν το πρόβλημα παραμένει.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Το Καλάθι μου
@@ -840,10 +843,10 @@ DocType: Packing Slip Item,Packing Slip Item,Είδος δελτίου συσκ
 DocType: POS Profile,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +551,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/templates/form_grid/item_grid.html +72,Discount,Έκπτωση
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Έκπτωση
 DocType: Features Setup,Purchase Discounts,Εκπτώσεις αγοράς
 DocType: Workstation,Wages,Μισθοί
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Θα πρέπει να ενημερώνεται μόνο αν ο χρόνος καταγραφής είναι «Χρεώσιμη»
@@ -910,6 +913,7 @@ DocType: Company,Company registration numbers for your reference. Tax numbers et
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/public/js/controllers/transaction.js +881,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.,Επιλέξτε αρχεία καταγραφής χρονολογίου και πατήστε υποβολή για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης
@@ -1050,7 +1054,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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,Συνολική εξερχόμενη
@@ -1122,6 +1126,7 @@ 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 +211,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 +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Μέγιστο: {0}
@@ -1133,7 +1138,7 @@ DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης α
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1181,7 +1186,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Αναλ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
 DocType: Item,Inventory,Απογραφή
 DocType: Features Setup,"To enable ""Point of Sale"" view",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; προβολή
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
+apps/erpnext/erpnext/public/js/pos/pos.js +408,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,Στην ποσότητα
@@ -1200,6 +1205,7 @@ apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliat
 apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση
 DocType: Employee External Work History,Total Experience,Συνολική εμπειρία
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
+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,Χρεώσεις μεταφοράς και προώθησης
 DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης
 DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών
@@ -1212,7 +1218,7 @@ DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Πρόσθετες ποσό έκπτωσης (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Σφάλμα: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Σφάλμα: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Παρακαλώ να δημιουργήσετε νέο λογαριασμό από το λογιστικό σχέδιο.
 DocType: Maintenance Visit,Maintenance Visit,Επίσκεψη συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Πελάτης> ομάδα πελατών > περιοχή
@@ -1262,7 +1268,7 @@ DocType: Production Planning Tool,Select Sales Orders,Επιλέξτε παρα
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +118,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Παρακολούθηση ειδών με barcode. Είναι δυνατή η εισαγωγή ειδών στο δελτίο αποστολής και στο τιμολόγιο πώλησης με σάρωση του barcode των ειδών.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Κάντε Προσφορά
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
 apps/erpnext/erpnext/stock/doctype/item/item.py +340,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
@@ -1272,7 +1278,8 @@ DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσε
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
 DocType: Payment Tool Detail,Payment Amount,Ποσό πληρωμής
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Προβολή
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Προβολή
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
@@ -1309,6 +1316,7 @@ DocType: Payment Reconciliation,Payments,Πληρωμές
 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',Για την έκπτωση με βάση πελάτη είναι απαραίτητο να επιλεγεί πελάτης
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ενημέρωση ημερομηνιών πληρωμών τραπέζης μέσω ημερολογίου.
@@ -1356,7 +1364,7 @@ DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Address,Postal,Ταχυδρομικός
 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 +147,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα
 apps/erpnext/erpnext/templates/pages/order.html +56,text {0},κειμένου {0}
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
@@ -1390,7 +1398,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
@@ -1415,7 +1423,7 @@ DocType: Item,Apply Warehouse-wise Reorder Level,Εφάρμοσε το επίπ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Αρχείο καταγραφής χρονολογίου για εργασίες.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Πληρωμή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,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,Χαιρετισμός
@@ -1522,7 +1530,7 @@ DocType: Appraisal,For Employee Name,Για το όνομα υπαλλήλου
 DocType: Holiday List,Clear Table,Καθαρισμός πίνακα
 DocType: Features Setup,Brands,Εμπορικά σήματα
 DocType: C-Form Invoice Detail,Invoice No,Αρ. Τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Από παραγγελία αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Από παραγγελία αγοράς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"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,Διευθύνσεις πελατών και των επαφών
@@ -1762,13 +1770,14 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Μεταφορά υλικού
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
 DocType: Installation Note,Installation Note,Σημείωση εγκατάστασης
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,Add Taxes,Προσθήκη φόρων
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Ταμειακές ροές από χρηματοδοτικές
 ,Financial Analytics,Χρηματοοικονομικές αναφορές
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 DocType: Address,Subsidiary,Θυγατρική
@@ -1811,6 +1820,7 @@ apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales emai
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Tool,Payment Account,Λογαριασμός πληρωμών
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/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 +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
@@ -2143,7 +2153,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
 DocType: Quality Inspection,Quality Inspection,Επιθεώρηση ποιότητας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
@@ -2195,7 +2205,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Expense Claim,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Πληρωμή
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Πληρωμή
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Έως ημερομηνία και ώρα
 DocType: SMS Settings,SMS Gateway URL,SMS gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
@@ -2242,7 +2252,7 @@ DocType: Target Detail,Target Detail,Λεπτομέρειες στόχου
 DocType: Sales Order,% of materials billed against this Sales Order,% Των υλικών που χρεώθηκαν σε αυτήν την παραγγελία πώλησης
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Καταχώρηση κλεισίματος περιόδου
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Απόσβεση
+DocType: Account,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
 DocType: Customer,Credit Limit,Πιστωτικό όριο
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Επιλέξτε τον τύπο της συναλλαγής
@@ -2267,6 +2277,7 @@ DocType: Quality Inspection,Outgoing,Εξερχόμενος
 DocType: Material Request,Requested For,Ζητήθηκαν για
 DocType: Quotation Item,Against Doctype,Κατά τύπο εγγράφου
 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 +176,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Προβολή καταχωρήσεων αποθέματος
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
@@ -2404,9 +2415,9 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Ποσό αποδει
 DocType: Time Log,Batched for Billing,Ομαδοποιημένα για χρέωση
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Λογαριασμοί από τους προμηθευτές.
 DocType: POS Profile,Write Off Account,Διαγραφή λογαριασμού
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Καθαρές ροές από λειτουργικές δραστηριότητες
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,Π.Χ. Φπα
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Στοιχείο 4
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
@@ -2580,7 +2591,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 			conflict by assigning priority. Price Rules: {0}","Πολλαπλοί κανόνας τιμής υπάρχουν με τα ίδια κριτήρια, παρακαλώ να επιλύσετε την διένεξη \ σύγκρουση με τον ορισμό προτεραιότητας. Κανόνες τιμής: {0}"""
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 DocType: Hub Settings,Access Token,Η πρόσβαση παραχωρήθηκε
@@ -2600,6 +2611,7 @@ DocType: Purchase Invoice Item,Image View,Προβολή εικόνας
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
+apps/erpnext/erpnext/stock/doctype/item/item.py +544,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,Αποτίμηση και σύνολο
@@ -2607,6 +2619,7 @@ DocType: Tax Rule,Shipping City,Αποστολές Σίτι
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Αυτό το στοιχείο είναι μια παραλλαγή του {0} (προτύπου). Τα χαρακτηριστικά θα αντιγραφούν  από το πρότυπο, εκτός αν έχει οριστεί «όχι αντιγραφή '"
 DocType: Account,Purchase User,Χρήστης αγορών
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Ταμειακές ροές από εργασίες
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
 DocType: Journal Entry,Print Heading,Εκτύπωση κεφαλίδας
@@ -2647,7 +2660,7 @@ apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet
 apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Ώρα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Δημιουργία προσφοράς
@@ -2659,7 +2672,7 @@ DocType: BOM Replace Tool,The new BOM after replacement,Η νέα Λ.Υ. μετ
 DocType: Features Setup,Point of Sale,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/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,From Product Bundle,Από Bundle Προϊόν
 DocType: Production Planning Tool,Production Planning Tool,Εργαλείο σχεδιασμού παραγωγής
 DocType: Quality Inspection,Report Date,Ημερομηνία έκθεσης
 DocType: C-Form,Invoices,Τιμολόγια
@@ -2674,6 +2687,7 @@ DocType: Stock Settings,Percentage you are allowed to receive or deliver more ag
 DocType: Pricing Rule,Customer Group,Ομάδα πελατών
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,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,Ε.Σ.Υ. Ημερομηνία λήξης
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
@@ -2685,7 +2699,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 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 +485,Get Items,Βρες είδη
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Βρες είδη
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Δημιούργησε τιμολόγιο έμμεσης εσωτερικής φορολογίας
@@ -2735,7 +2749,7 @@ DocType: Quality Inspection,Delivery Note No,Αρ. δελτίου αποστολ
 DocType: Company,Retail,Λιανική πώληση
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,O πελάτης {0} δεν υπάρχει
 DocType: Attendance,Absent,Απών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Πακέτο προϊόντων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
@@ -2763,7 +2777,7 @@ DocType: Sales Invoice,Product Bundle Help,Προϊόν Βοήθεια Bundle
 ,Monthly Attendance Sheet,Μηνιαίο δελτίο συμμετοχής
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Δεν βρέθηκαν εγγραφές
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργός
 DocType: GL Entry,Is Advance,Είναι προκαταβολή
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Η συμμετοχή από και μέχρι είναι απαραίτητη
@@ -2954,7 +2968,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Ποσοστό ( %
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Ημερομηνία λήξης για η χρήση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Μείωση κερδών για άδεια άνευ αποδοχών (Α.Α.Α.)
@@ -2977,6 +2991,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Εργ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +128,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/config/crm.py +151,Newsletters,Ενημερωτικά Δελτία
 DocType: Address,Shipping,Αποστολή
 DocType: Stock Ledger Entry,Stock Ledger Entry,Καθολική καταχώρηση αποθέματος
@@ -2996,7 +3011,6 @@ DocType: Account,Auditor,Ελεγκτής
 DocType: Purchase Order,End date of current order's period,Ημερομηνία λήξης της περιόδου της τρέχουσας παραγγελίας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Πραγματοποίηση προσφοράς Επιστολή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Απόδοση
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
@@ -3041,6 +3055,7 @@ apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{
 DocType: Opportunity,Next Contact,Επόμενο Επικοινωνία
 DocType: Employee,Employment Type,Τύπος απασχόλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Πάγια
+,Cash Flow,Κατάσταση Ταμειακών Ροών
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be across two alocation records,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι σε δύο εγγραφές alocation
 DocType: Item Group,Default Expense Account,Προεπιλεγμένος λογαριασμός δαπανών
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
@@ -3078,7 +3093,7 @@ DocType: Workstation,per hour,Ανά ώρα
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Πληρωμένο Ποσό
+apps/erpnext/erpnext/public/js/pos/pos.js +428,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}%
@@ -3120,7 +3135,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Transaction n
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID υποστήριξης. ( Π.Χ. Support@example.Com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +570,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.","Δημιουργία δελτίων συσκευασίας για τα πακέτα που είναι να παραδοθούν. Χρησιμοποιείται για να ενημερώσει τον αριθμό πακέτου, το περιεχόμενο του πακέτου και το βάρος του."
@@ -3233,7 +3248,7 @@ DocType: Time Log,Hours,Ώρες
 DocType: Project,Expected Start Date,Αναμενόμενη ημερομηνία έναρξης
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Π.Χ. SMSgateway.Com / api / send_SMS.Cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Λήψη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,Receive,Λήψη
 DocType: Maintenance Visit,Fully Completed,Πλήρως ολοκληρωμένο
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
@@ -3337,7 +3352,7 @@ 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 +580,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
 apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Δραστηριότητες / εργασίες έργου
@@ -3456,7 +3471,7 @@ DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Δαπάνες διοικήσεως
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Συμβουλή
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Αλλαγή
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Αλλαγή
 DocType: Purchase Invoice,Contact Email,Email επαφής
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
@@ -3472,7 +3487,7 @@ apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zer
 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 +562,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,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}
@@ -3538,7 +3553,7 @@ DocType: Account,Parent Account,Γονικός λογαριασμός
 DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/public/js/pos/pos.js +96,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} πρέπει να οριστεί ως έχει φύγει
@@ -3563,7 +3578,7 @@ apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Παρτίδα Απο
 DocType: Employee,Contract End Date,Ημερομηνία λήξης συμβολαίου
 DocType: Sales Order,Track this Sales Order against any Project,Παρακολουθήστε αυτές τις πωλήσεις παραγγελίας σε οποιουδήποτε έργο
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Εμφάνισε παραγγελίες πώλησης (εκκρεμεί παράδοση) με βάση τα ανωτέρω κριτήρια
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Από προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Από προσφορά προμηθευτή
 DocType: Deduction Type,Deduction Type,Τύπος κράτησης
 DocType: Attendance,Half Day,Μισή ημέρα
 DocType: Pricing Rule,Min Qty,Ελάχιστη ποσότητα
@@ -3650,7 +3665,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill Υλικών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -17,7 +17,7 @@ DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Alquilado
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Desde solicitud de material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +661,From Material Request,Desde solicitud de material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
@@ -48,7 +48,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código de artículo del cliente y para efectuar búsquedas en ellos en función de ese código use esta opción
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de Fallecimiento
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
@@ -58,7 +58,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already as
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección De Correo Electrónico
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
@@ -67,7 +67,7 @@ DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
+apps/erpnext/erpnext/public/js/pos/pos.js +534,Please select Price List,"Por favor, seleccione la lista de precios"
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Hora de registro
@@ -216,7 +216,7 @@ apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to compan
 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 +398,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +577,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
@@ -228,7 +228,7 @@ DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorios
-apps/erpnext/erpnext/stock/doctype/item/item.py +596,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is cancelled,El producto {0} esta cancelado
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de Compra
@@ -283,7 +283,7 @@ apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccione Producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,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 +262,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
@@ -354,7 +354,7 @@ DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
 DocType: Material Request Item,Required Date,Fecha Requerida
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +736,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Costeo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
@@ -471,7 +471,7 @@ DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Desde recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +582,From Purchase Receipt,Desde recibo de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
@@ -738,7 +738,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 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 +626,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +627,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
@@ -758,7 +758,7 @@ 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/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su Fotografía
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Hacer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +629,Make ,Hacer
 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 podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
@@ -780,7 +780,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
 DocType: Delivery Note,Delivery To,Entregar a
 DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuentos sobre Compra
 DocType: Workstation,Wages,Salario
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualiza sólo si Hora de registro es &quot;facturable&quot;
@@ -969,7 +969,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated perc
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,For Supplier,Por proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -1047,7 +1047,7 @@ DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +587,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +588,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago
@@ -1090,7 +1090,7 @@ DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estaci
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
 DocType: Item,Inventory,inventario
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
+apps/erpnext/erpnext/public/js/pos/pos.js +408,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de Ventas
 DocType: Opportunity,With Items,Con artículos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Cantidad
@@ -1121,7 +1121,7 @@ DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +629,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
@@ -1177,7 +1177,7 @@ DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaño
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Pago recibido
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
+apps/erpnext/erpnext/public/js/pos/pos.js +497,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
 apps/erpnext/erpnext/stock/doctype/item/item.py +335,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
@@ -1250,7 +1250,7 @@ DocType: Upload Attendance,Get Template,Verificar Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Coeficiente de Ponderación
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/public/js/pos/pos.js +152,Please select {0} first.,"Por favor, seleccione primero {0}"
 DocType: Territory,Parent Territory,Territorio Principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
@@ -1281,7 +1281,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +357,Default BOM ({0}) must be a
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +546,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
@@ -1407,7 +1407,7 @@ DocType: Appraisal,For Employee Name,Por nombre de empleado
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,From Purchase Order,Desde órden de compra
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Las direcciones de clientes y contactos
 DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia
@@ -1630,7 +1630,7 @@ DocType: Cost Center,Track separate Income and Expense for product verticals or
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
 DocType: Item Reorder,Item Reorder,Reordenar productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +578,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,Usuario elegirá siempre
@@ -1990,7 +1990,7 @@ DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Curre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de Calidad
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
@@ -2039,7 +2039,7 @@ apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Pe
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Pagar
+apps/erpnext/erpnext/public/js/pos/pos.js +349,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
@@ -2083,7 +2083,7 @@ DocType: Target Detail,Target Detail,Objetivo Detalle
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiales facturados contra la orden de venta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entradas de cierre de período
 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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciación
+DocType: Account,Depreciation,Depreciación
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
 DocType: Customer,Credit Limit,Límite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción
@@ -2233,7 +2233,6 @@ DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Monto de costos de des
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de desajuste
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
 apps/erpnext/erpnext/public/js/setup_wizard.js +310,e.g. VAT,por ejemplo IVA
@@ -2398,7 +2397,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multipl
 conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 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 +580,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Por almacén
 DocType: Employee,Offer Date,Fecha de Oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2462,7 +2461,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +381,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
 Stock Reconciliación"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +601,Transfer Material to Supplier,Transferencia de material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de Iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotización
@@ -2495,7 +2494,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +411,Please
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Por favor seleccione trasladar, si usted desea incluir los saldos del año fiscal anterior a este año"
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtener Artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,Obtener Artículos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
@@ -2538,7 +2537,7 @@ DocType: Quality Inspection,Delivery Note No,No. de Nota de Entrega
 DocType: Company,Retail,venta al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} no existe Cliente
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Conjunto/Paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +472,Product Bundle,Conjunto/Paquete de productos
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
 DocType: Upload Attendance,Download Template,Descargar Plantilla
 DocType: GL Entry,Remarks,Observaciones
@@ -2739,7 +2738,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_cal
 apps/erpnext/erpnext/public/js/setup_wizard.js +312,Rate (%),Procentaje (% )
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por 'nombre'"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
@@ -2852,7 +2851,7 @@ DocType: Workstation,per hour,por horas
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
+apps/erpnext/erpnext/public/js/pos/pos.js +428,Amount Paid,Total Pagado
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
@@ -3199,7 +3198,7 @@ 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/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
+apps/erpnext/erpnext/public/js/pos/pos.js +435,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
 apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
@@ -3271,7 +3270,7 @@ DocType: Account,Parent Account,Cuenta Primaria
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/public/js/pos/pos.js +96,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
@@ -3292,7 +3291,7 @@ DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
 DocType: Employee,Contract End Date,Fecha Fin de Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Desde cotización del proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,From Supplier Quotation,Desde cotización del proveedor
 DocType: Deduction Type,Deduction Type,Tipo de Deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad Mínima
@@ -3372,7 +3371,7 @@ DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,N
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de Crédito
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rushabh Mehta	d55d0c06e3	Merge branch 'develop'	2015-12-23 16:29:34 +05:30
Rushabh Mehta	8681a95010	bumped to version 6.14.1	2015-12-23 16:59:34 +06:00
Rushabh Mehta	1f63747916	[minor] [fix] add child in sales browser	2015-12-23 16:23:37 +05:30
Rushabh Mehta	332ec15dd7	Merge pull request #4525 from nabinhait/jv_fix_10 [fix] Validate advance entry based on party	2015-12-23 16:09:29 +05:30
Nabin Hait	6f8dafbb5e	[fix] Validate advance entry based on party	2015-12-23 13:03:31 +05:30
Rushabh Mehta	d4073d50b2	Merge pull request #4530 from umairsy/develop Updated screenshots in some articles	2015-12-23 13:01:30 +05:30
Rushabh Mehta	88bcee78a7	Merge pull request #4524 from nabinhait/jv_fix_9 [fix] Set debit/credit in company currency	2015-12-23 12:59:02 +05:30
Rushabh Mehta	cc2796e676	Merge pull request #4520 from partzsch/develop Time Log now down to seconds	2015-12-23 12:56:44 +05:30
Umair Sayyed	dbaf6b569b	Updated screenshots in some articles	2015-12-23 12:11:53 +05:30
Nabin Hait	d37cef7f60	[fix] Set debit/credit in company currency	2015-12-22 15:13:01 +05:30
Rushabh Mehta	01293bb3a3	[fix] [minor] fix available qty even if 0	2015-12-22 12:57:42 +05:30
partzsch	55ad42cfd0	Time Log now down to seconds according to request of @anadpdoshi new branch new commit new PR	2015-12-21 17:51:42 +01:00
Anand Doshi	381cec7b87	[fix] added Shopping Cart and Report Builder in Learn module	2015-12-21 18:56:20 +05:30
Anand Doshi	4c87497b7c	Merge branch 'develop'	2015-12-21 18:34:08 +05:30
Anand Doshi	9fdf2a8bfe	bumped to version 6.14.0	2015-12-21 19:04:08 +06:00
Anand Doshi	f773f1f539	[videos] added missing videos	2015-12-21 18:32:23 +05:30
Anand Doshi	7b8a224dd0	Merge pull request #4519 from umairsy/develop video help page on report builder and shopping cart	2015-12-21 18:16:26 +05:30
Umair Sayyed	e1482f1acc	video help page on report builder and shopping cart	2015-12-21 18:06:15 +05:30
Anand Doshi	c98d244af0	[change-log]	2015-12-21 17:31:09 +05:30
Anand Doshi	ee19fc0c7f	[translations] + added Gujarati - Fixes frappe/translator#63	2015-12-21 17:10:20 +05:30
Anand Doshi	ee2129ce1c	Merge pull request #4513 from nabinhait/discount_percentage Additional Discount amount based on percentage	2015-12-21 16:13:17 +05:30
Anand Doshi	beed9ae4f8	Merge pull request #4510 from nabinhait/account_merge [fix] Group account merging with sub-ordinate group	2015-12-21 16:03:19 +05:30
Anand Doshi	50ddf921be	[minor] UOM message	2015-12-21 10:58:33 +05:30
Nabin Hait	3769d87240	Additional Discount amount based on percentage	2015-12-18 13:12:08 +05:30
Anand Doshi	15050e326c	Merge pull request #4509 from anandpdoshi/fix/validate-total-transfer-in-material-request [fix] Validate transfer qty cannot be greater than qty	2015-12-18 10:50:36 +05:30
Anand Doshi	0f809426d2	[fix] Validate transfer qty cannot be greater than qty	2015-12-17 22:35:03 +05:30
Nabin Hait	adab5d308c	[fix] Group account merging with sub-ordinate group	2015-12-17 12:53:25 +05:30
Nabin Hait	824122c42a	Merge branch 'ccfiel-develop' into develop	2015-12-17 12:20:40 +05:30
Nabin Hait	afda26e4f3	Fixed conflict	2015-12-17 12:19:58 +05:30
Chris Ian Fiel	d6d354b5c3	By: nabinhait Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".	2015-12-17 09:42:12 +08:00
Chris Ian Fiel	7d310bd182	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2015-12-17 09:18:24 +08:00
Nabin Hait	8b33a6cdc0	Cleanup in cash flow	2015-12-16 16:09:43 +05:30
Nabin Hait	5e173c7106	Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop	2015-12-15 17:39:55 +05:30
Chris Ian Fiel	c80796cdd5	Cash Flow Report	2015-12-12 11:26:54 +08:00
Chris Ian Fiel	fde03453e4	Cash Flow Report	2015-12-12 10:54:56 +08:00
Chris Ian Fiel	826e18a29f	Cash Flow Report	2015-12-12 10:33:01 +08:00
				`@@ -629,8 +629,6 @@ A logical Warehouse against which stock entries are made.`





				`<li>`