Merge branch 'develop' into tax_fetch_quote

erpnext/accounts/doctype/account/account.py

@@ -117,7 +117,9 @@ class Account(NestedSet):
 
 			for d in frappe.db.get_values('Account', filters=filters, fieldname=["company", "name"], as_dict=True):
 				parent_acc_name_map[d["company"]] = d["name"]
+
 			if not parent_acc_name_map: return
+
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
 	def validate_group_or_ledger(self):
@@ -289,10 +291,30 @@ def validate_account_number(name, account_number, company):
 				.format(account_number, account_with_same_number))
 
 @frappe.whitelist()
-def update_account_number(name, account_name, account_number=None):
-
+def update_account_number(name, account_name, account_number=None, from_descendant=False):
 	account = frappe.db.get_value("Account", name, "company", as_dict=True)
 	if not account: return
+
+	old_acc_name, old_acc_number = frappe.db.get_value('Account', name, \
+				["account_name", "account_number"])
+
+	# check if account exists in parent company
+	ancestors = get_ancestors_of("Company", account.company)
+	allow_independent_account_creation = frappe.get_value("Company", account.company, "allow_account_creation_against_child_company")
+
+	if ancestors and not allow_independent_account_creation:
+		for ancestor in ancestors:
+			if frappe.db.get_value("Account", {'account_name': old_acc_name, 'company': ancestor}, 'name'):
+				# same account in parent company exists
+				allow_child_account_creation = _("Allow Account Creation Against Child Company")
+
+				message = _("Account {0} exists in parent company {1}.").format(frappe.bold(old_acc_name), frappe.bold(ancestor))
+				message += "<br>" + _("Renaming it is only allowed via parent company {0}, \
+					to avoid mismatch.").format(frappe.bold(ancestor)) + "<br><br>"
+				message += _("To overrule this, enable '{0}' in company {1}").format(allow_child_account_creation, frappe.bold(account.company))
+
+				frappe.throw(message, title=_("Rename Not Allowed"))
+
 	validate_account_number(name, account_number, account.company)
 	if account_number:
 		frappe.db.set_value("Account", name, "account_number", account_number.strip())
@@ -300,6 +322,12 @@ def update_account_number(name, account_name, account_number=None):
 		frappe.db.set_value("Account", name, "account_number", "")
 	frappe.db.set_value("Account", name, "account_name", account_name.strip())
 
+	if not from_descendant:
+		# Update and rename in child company accounts as well
+		descendants = get_descendants_of('Company', account.company)
+		if descendants:
+			sync_update_account_number_in_child(descendants, old_acc_name, account_name, account_number, old_acc_number)
+
 	new_name = get_account_autoname(account_number, account_name, account.company)
 	if name != new_name:
 		frappe.rename_doc("Account", name, new_name, force=1)
@@ -330,3 +358,14 @@ def get_root_company(company):
 	# return the topmost company in the hierarchy
 	ancestors = get_ancestors_of('Company', company, "lft asc")
 	return [ancestors[0]] if ancestors else []
+
+def sync_update_account_number_in_child(descendants, old_acc_name, account_name, account_number=None, old_acc_number=None):
+	filters = {
+		"company": ["in", descendants],
+		"account_name": old_acc_name,
+	}
+	if old_acc_number:
+		filters["account_number"] = old_acc_number
+
+	for d in frappe.db.get_values('Account', filters=filters, fieldname=["company", "name"], as_dict=True):
+			update_account_number(d["name"], account_name, account_number, from_descendant=True)

erpnext/accounts/doctype/account/test_account.py

@@ -5,8 +5,7 @@ from __future__ import unicode_literals
 import unittest
 import frappe
 from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
-from erpnext.accounts.doctype.account.account import update_account_number
-from erpnext.accounts.doctype.account.account import merge_account
+from erpnext.accounts.doctype.account.account import update_account_number, merge_account
 
 class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
@@ -99,7 +98,8 @@ class TestAccount(unittest.TestCase):
 			"Softwares - _TC", doc.is_group, doc.root_type, doc.company)
 
 	def test_account_sync(self):
-		del frappe.local.flags["ignore_root_company_validation"]
+		frappe.local.flags.pop("ignore_root_company_validation", None)
+
 		acc = frappe.new_doc("Account")
 		acc.account_name = "Test Sync Account"
 		acc.parent_account = "Temporary Accounts - _TC3"
@@ -111,6 +111,55 @@ class TestAccount(unittest.TestCase):
 		self.assertEqual(acc_tc_4, "Test Sync Account - _TC4")
 		self.assertEqual(acc_tc_5, "Test Sync Account - _TC5")
 
+	def test_account_rename_sync(self):
+		frappe.local.flags.pop("ignore_root_company_validation", None)
+
+		acc = frappe.new_doc("Account")
+		acc.account_name = "Test Rename Account"
+		acc.parent_account = "Temporary Accounts - _TC3"
+		acc.company = "_Test Company 3"
+		acc.insert()
+
+		# Rename account in parent company
+		update_account_number(acc.name, "Test Rename Sync Account", "1234")
+
+		# Check if renamed in children
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Rename Sync Account", "company": "_Test Company 4", "account_number": "1234"}))
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Rename Sync Account", "company": "_Test Company 5", "account_number": "1234"}))
+
+		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC3")
+		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC4")
+		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC5")
+
+	def test_child_company_account_rename_sync(self):
+		frappe.local.flags.pop("ignore_root_company_validation", None)
+
+		acc = frappe.new_doc("Account")
+		acc.account_name = "Test Group Account"
+		acc.parent_account = "Temporary Accounts - _TC3"
+		acc.is_group = 1
+		acc.company = "_Test Company 3"
+		acc.insert()
+
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Group Account", "company": "_Test Company 4"}))
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Group Account", "company": "_Test Company 5"}))
+
+		# Try renaming child company account
+		acc_tc_5 = frappe.db.get_value('Account', {'account_name': "Test Group Account", "company": "_Test Company 5"})
+		self.assertRaises(frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account")
+
+		# Rename child company account with allow_account_creation_against_child_company enabled
+		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 1)
+
+		update_account_number(acc_tc_5, "Test Modified Account")
+		self.assertTrue(frappe.db.exists("Account", {'name': "Test Modified Account - _TC5", "company": "_Test Company 5"}))
+
+		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 0)
+
+		to_delete = ["Test Group Account - _TC3", "Test Group Account - _TC4", "Test Modified Account - _TC5"]
+		for doc in to_delete:
+			frappe.delete_doc("Account", doc)
+
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
 

erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py

@@ -32,12 +32,12 @@ def execute(filters=None):
 
 	chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
 
-	default_currency = frappe.get_cached_value('Company', filters.company, "default_currency")
-	report_summary = get_report_summary(period_list, filters.periodicity, income, expense, net_profit_loss, default_currency)
+	currency = filters.presentation_currency or frappe.get_cached_value('Company', filters.company, "default_currency")
+	report_summary = get_report_summary(period_list, filters.periodicity, income, expense, net_profit_loss, currency)
 
 	return columns, data, None, chart, report_summary
 
-def get_report_summary(period_list, periodicity, income, expense, net_profit_loss, default_currency, consolidated=False):
+def get_report_summary(period_list, periodicity, income, expense, net_profit_loss, currency, consolidated=False):
 	net_income, net_expense, net_profit = 0.0, 0.0, 0.0
 
 	for period in period_list:
@@ -64,19 +64,19 @@ def get_report_summary(period_list, periodicity, income, expense, net_profit_los
 			"indicator": "Green" if net_profit > 0 else "Red",
 			"label": profit_label,
 			"datatype": "Currency",
-			"currency": net_profit_loss.get("currency") if net_profit_loss else default_currency
+			"currency": currency
 		},
 		{
 			"value": net_income,
 			"label": income_label,
 			"datatype": "Currency",
-			"currency": income[-1].get('currency') if income else default_currency
+			"currency": currency
 		},
 		{
 			"value": net_expense,
 			"label": expense_label,
 			"datatype": "Currency",
-			"currency": expense[-1].get('currency') if expense else default_currency
+			"currency": currency
 		}
 	]
 
@@ -143,4 +143,4 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
 
 	chart["fieldtype"] = "Currency"
 
-	return chart
+	return chart

erpnext/accounts/report/trial_balance/trial_balance.js

@@ -72,6 +72,12 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 				"fieldtype": "Link",
 				"options": "Finance Book",
 			},
+			{
+				"fieldname": "presentation_currency",
+				"label": __("Currency"),
+				"fieldtype": "Select",
+				"options": erpnext.get_presentation_currency_list()
+			},
 			{
 				"fieldname": "with_period_closing_entry",
 				"label": __("Period Closing Entry"),

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -56,7 +56,7 @@ def get_data(filters):
 	accounts = frappe.db.sql("""select name, account_number, parent_account, account_name, root_type, report_type, lft, rgt
 
 		from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)
-	company_currency = erpnext.get_company_currency(filters.company)
+	company_currency = filters.presentation_currency or erpnext.get_company_currency(filters.company)
 
 	if not accounts:
 		return None

erpnext/accounts/utils.py

@@ -683,6 +683,7 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
 		where
 			party_type = %(party_type)s and party = %(party)s
 			and account = %(account)s and {dr_or_cr} > 0
+			and is_cancelled=0
 			{condition}
 			and ((voucher_type = 'Journal Entry'
 					and (against_voucher = '' or against_voucher is null))
@@ -705,6 +706,7 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
 			and account = %(account)s
 			and {payment_dr_or_cr} > 0
 			and against_voucher is not null and against_voucher != ''
+			and is_cancelled=0
 		group by against_voucher_type, against_voucher
 	""".format(payment_dr_or_cr=payment_dr_or_cr), {
 		"party_type": party_type,

erpnext/controllers/accounts_controller.py

@@ -1242,7 +1242,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 		try:
 			doc.check_permission(perm_type)
 		except frappe.PermissionError:
-			actions = { 'create': 'add', 'write': 'update', 'cancel': 'remove' }
+			actions = { 'create': 'add', 'write': 'update'}
 
 			frappe.throw(_("You do not have permissions to {} items in a {}.")
 				.format(actions[perm_type], parent_doctype), title=_("Insufficient Permissions"))
@@ -1285,7 +1285,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 	sales_doctypes = ['Sales Order', 'Sales Invoice', 'Delivery Note', 'Quotation']
 	parent = frappe.get_doc(parent_doctype, parent_doctype_name)
 
-	check_doc_permissions(parent, 'cancel')
+	check_doc_permissions(parent, 'write')
 	validate_and_delete_children(parent, data)
 
 	for d in data:

erpnext/controllers/queries.py

@@ -368,13 +368,17 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 	searchfields = meta.get_search_fields()
 
 	search_columns = ''
+	search_cond = ''
+
 	if searchfields:
 		search_columns = ", " + ", ".join(searchfields)
+		search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
 
 	if args.get('warehouse'):
 		searchfields = ['batch.' + field for field in searchfields]
 		if searchfields:
 			search_columns = ", " + ", ".join(searchfields)
+			search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
 
 		batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom,
 				concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date)
@@ -387,7 +391,8 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 				and sle.warehouse = %(warehouse)s
 				and (sle.batch_no like %(txt)s
 				or batch.expiry_date like %(txt)s
-				or batch.manufacturing_date like %(txt)s)
+				or batch.manufacturing_date like %(txt)s
+				{search_cond})
 				and batch.docstatus < 2
 				{cond}
 				{match_conditions}
@@ -397,7 +402,8 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 				search_columns = search_columns,
 				cond=cond,
 				match_conditions=get_match_cond(doctype),
-				having_clause = having_clause
+				having_clause = having_clause,
+				search_cond = search_cond
 			), args)
 
 		return batch_nos
@@ -409,12 +415,15 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 			and item = %(item_code)s
 			and (name like %(txt)s
 			or expiry_date like %(txt)s
-			or manufacturing_date like %(txt)s)
+			or manufacturing_date like %(txt)s
+			{search_cond})
 			and docstatus < 2
 			{0}
 			{match_conditions}
+
 			order by expiry_date, name desc
-			limit %(start)s, %(page_len)s""".format(cond, search_columns = search_columns, match_conditions=get_match_cond(doctype)), args)
+			limit %(start)s, %(page_len)s""".format(cond, search_columns = search_columns,
+			search_cond = search_cond, match_conditions=get_match_cond(doctype)), args)
 
 
 @frappe.whitelist()

erpnext/hooks.py

@@ -23,7 +23,6 @@ web_include_css = "assets/css/erpnext-web.css"
 doctype_js = {
 	"Communication": "public/js/communication.js",
 	"Event": "public/js/event.js",
-	"Website Theme": "public/js/website_theme.js",
 	"Newsletter": "public/js/newsletter.js"
 }
 

erpnext/hr/doctype/employee/employee.py

@@ -56,6 +56,9 @@ class Employee(NestedSet):
 			if existing_user_id:
 				remove_user_permission(
 					"Employee", self.name, existing_user_id)
+	
+	def after_rename(self, old, new, merge):
+		self.db_set("employee", new)
 
 	def set_employee_name(self):
 		self.employee_name = ' '.join(filter(lambda x: x, [self.first_name, self.middle_name, self.last_name]))

erpnext/non_profit/doctype/membership/membership.py

@@ -224,7 +224,8 @@ def trigger_razorpay_subscription(*args, **kwargs):
 		member.subscription_activated = 1
 		member.save(ignore_permissions=True)
 	except Exception as e:
-		log = frappe.log_error(e, "Error creating membership entry")
+		message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id)
+		log = frappe.log_error(message, _("Error creating membership entry for {0}").format(member.name))
 		notify_failure(log)
 		return { 'status': 'Failed', 'reason': e}
 
@@ -250,4 +251,4 @@ def get_plan_from_razorpay_id(plan_id):
 	try:
 		return plan[0]['name']
 	except:
-		return None
+		return None

erpnext/public/js/website_theme.js

@@ -1,14 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.form.on('Website Theme', {
-	validate(frm) {
-		let theme_scss = frm.doc.theme_scss;
-		if (theme_scss && (theme_scss.includes('frappe/public/scss/website')
-			&& !theme_scss.includes('erpnext/public/scss/website'))
-		) {
-			frm.set_value('theme_scss',
-				`${frm.doc.theme_scss}\n@import "erpnext/public/scss/website";`);
-		}
-	}
-});

erpnext/selling/doctype/sales_order/sales_order.js

@@ -181,7 +181,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 					}
 
 					// project
-					if(flt(doc.per_delivered, 2) < 100 && (order_is_a_sale || order_is_a_custom_sale) && allow_delivery) {
+					if(flt(doc.per_delivered, 2) < 100) {
 							this.frm.add_custom_button(__('Project'), () => this.make_project(), __('Create'));
 					}
 

erpnext/setup/doctype/naming_series/naming_series.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import cstr
+from frappe.utils import cstr, cint
 from frappe import msgprint, throw, _
 
 from frappe.model.document import Document
@@ -159,7 +159,7 @@ class NamingSeries(Document):
 			prefix = self.parse_naming_series()
 			self.insert_series(prefix)
 			frappe.db.sql("update `tabSeries` set current = %s where name = %s",
-				(self.current_value, prefix))
+				(cint(self.current_value), prefix))
 			msgprint(_("Series Updated Successfully"))
 		else:
 			msgprint(_("Please select prefix first"))

erpnext/stock/doctype/item_attribute/item_attribute.json

@@ -1,357 +1,97 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:attribute_name", 
- "beta": 0, 
- "creation": "2014-09-26 03:49:54.899170", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:attribute_name",
+ "creation": "2014-09-26 03:49:54.899170",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "attribute_name",
+  "numeric_values",
+  "section_break_4",
+  "from_range",
+  "increment",
+  "column_break_8",
+  "to_range",
+  "section_break_5",
+  "item_attribute_values"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "attribute_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Attribute Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "attribute_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Attribute Name",
+   "reqd": 1,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "numeric_values", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Numeric Values", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "numeric_values",
+   "fieldtype": "Check",
+   "label": "Numeric Values"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "numeric_values", 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "numeric_values",
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "from_range", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "From Range", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "from_range",
+   "fieldtype": "Float",
+   "label": "From Range"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "increment", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Increment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "increment",
+   "fieldtype": "Float",
+   "label": "Increment"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_8", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_8",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "to_range", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To Range", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "to_range",
+   "fieldtype": "Float",
+   "label": "To Range"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: !doc.numeric_values", 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval: !doc.numeric_values",
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "item_attribute_values", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Attribute Values", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Attribute Value", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "item_attribute_values",
+   "fieldtype": "Table",
+   "label": "Item Attribute Values",
+   "options": "Item Attribute Value"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-edit", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-01-01 13:17:46.524806", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Attribute", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-edit",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2020-10-02 12:03:02.359202",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Attribute",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Item Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Item Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }

erpnext/stock/doctype/item_attribute/item_attribute.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from frappe import _
+from frappe.utils import flt
 
 from erpnext.controllers.item_variant import (validate_is_incremental,
 	validate_item_attribute_value, InvalidItemAttributeValueError)
@@ -42,7 +43,7 @@ class ItemAttribute(Document):
 			if self.from_range is None or self.to_range is None:
 				frappe.throw(_("Please specify from/to range"))
 
-			elif self.from_range >= self.to_range:
+			elif flt(self.from_range) >= flt(self.to_range):
 				frappe.throw(_("From Range has to be less than To Range"))
 
 			if not self.increment:

erpnext/translations/da_dk.csv

@@ -25,4 +25,3 @@ All Lead (Open),Alle Bly (Open),
 Default Selling Cost Center,Standard Selling Cost center,
 "Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn",
 Lead Details,Bly Detaljer,
-Lead Id,Bly Id,

erpnext/translations/es_cl.csv

@@ -1,7 +1,6 @@
 BOM does not contain any stock item,BOM no contiene ningún ítem de stock,
 Checkout,Finalizando pedido,
 Cheques and Deposits incorrectly cleared,Los cheques y depósitos resueltos de forma incorrecta,
-Child Item should not be a Product Bundle. Please remove item `{0}` and save,Artículo hijo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar,
 Get Items from Product Bundle,Obtener Ítems de Paquete de Productos,
 Gross Profit / Loss,Ganancia / Pérdida Bruta,
 Guardian1 Mobile No,Número de Móvil de Guardián 1,

erpnext/translations/es_co.csv

@@ -1,3 +1,4 @@
 Barcode {0} is not a valid {1} code,El código de barras {0} no es un código válido {1},
 Clear filters,Limpiar Filtros,
 {0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no tiene agenda del profesional médico . Añádelo al médico correspondiente.,
+Disabled,Deshabilitado,

erpnext/translations/es_mx.csv

@@ -1,7 +1,6 @@
 Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de Variantes después de la transacción de inventario. Deberá crear un nuevo artículo para hacer esto.,
 Cash Flow Statement,Estado de Flujo de Efectivo,
 Chart of Cost Centers,Gráfico de Centro de costos,
-"Company, Payment Account, From Date and To Date is mandatory","Empresa, cuenta de pago, fecha de inicio y fecha final son obligatorios",
 Financial Statements,Estados Financieros,
 Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos,
 Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio,

erpnext/translations/es_pe.csv

@@ -129,7 +129,6 @@ Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas,
 Expected Delivery Date,Fecha Esperada de Envio,
 Expected End Date,Fecha de finalización prevista,
 Expense Account,Cuenta de gastos,
-Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock",
 Expenses Included In Valuation,Gastos dentro de la valoración,
 Feedback,Comentarios,
 Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos ),
@@ -163,7 +162,6 @@ Item Code required at Row No {0},Código del producto requerido en la fila No. {
 Item Description,Descripción del Artículo,
 Item Group,Grupo de artículos,
 Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos",
-Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material,
 Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado,
 Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).,
 Journal Entry,Asientos Contables,
@@ -210,8 +208,6 @@ New Customer Revenue,Ingresos de nuevo cliente,
 New Customers,Clientes Nuevos,
 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,
 Next,Próximo,
-No address added yet.,No se ha añadido ninguna dirección todavía.,
-No contacts added yet.,No se han añadido contactos todavía,
 Nos,Números,
 Not Started,Sin comenzar,
 Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.,
@@ -235,8 +231,6 @@ Period Closing Entry,Entradas de cierre de período,
 Periodicity,Periodicidad,
 Piecework,Pieza de trabajo,
 Plan for maintenance visits.,Plan para las visitas de mantenimiento.,
-Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}",
-Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}",
 Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no",
 Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote",
 Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal",
@@ -304,7 +298,6 @@ Root cannot have a parent cost center,Raíz no puede tener un centro de costes d
 Round Off,Redondear,
 Row # {0}: ,Fila # {0}:,
 Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2},
-Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3},
 Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}",
 Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4}),
 Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno,
@@ -519,9 +512,11 @@ cannot be greater than 100,No puede ser mayor que 100,
 {0} {1} not in any active Fiscal Year.,{0} {1} no en algún año fiscal activo.,
 {0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2},
 {0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura,
+Email Settings,Configuración del correo electrónico,
 Import,Importación,
 Shop,Tienda,
 Subsidiary,Filial,
+There were errors while sending email. Please try again.,"Hubo errores al enviar el correo electrónico. Por favor, inténtelo de nuevo.",
 Print Heading,Título de impresión,
 Add Child,Agregar subcuenta,
 Company,Compañía(s),
@@ -714,7 +709,6 @@ Appraisal Template Goal,Objetivo Plantilla de Evaluación,
 Leave Application,Solicitud de Vacaciones,
 Leave Block List,Lista de Bloqueo de Vacaciones,
 Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .,
-Leave Approvers,Supervisores de Vacaciones,
 Leave Approver,Supervisor de Vacaciones,
 "System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos.",
 Contract End Date,Fecha Fin de Contrato,
@@ -851,7 +845,6 @@ Contribution (%),Contribución (%),
 Settings for Selling Module,Ajustes para vender Módulo,
 Customer Naming By,Naming Cliente Por,
 Campaign Naming By,Nombramiento de la Campaña Por,
-Sales Order Required,Orden de Ventas Requerida,
 Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones,
 All Sales Partner Contact,Todo Punto de Contacto de Venta,
 All Sales Person,Todos Ventas de Ventas,
@@ -1009,16 +1002,11 @@ Item Prices,Precios de los Artículos,
 Item Shortage Report,Reportar carencia de producto,
 Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto,
 Lead Details,Iniciativas,
-Lead Id,Iniciativa ID,
 Material Requests for which Supplier Quotations are not created,Solicitudes de Productos sin Cotizaciones Creadas,
 Monthly Attendance Sheet,Hoja de Asistencia Mensual,
-Ordered Items To Be Delivered,Artículos pedidos para ser entregados,
 Qty to Deliver,Cantidad para Ofrecer,
 Profit and Loss Statement,Estado de Pérdidas y Ganancias,
-Purchase Order Items To Be Billed,Ordenes de Compra por Facturar,
-Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos,
 Quotation Trends,Tendencias de Cotización,
-Requested Items To Be Ordered,Solicitud de Productos Aprobados,
 Requested Items To Be Transferred,Artículos solicitados para ser transferido,
 Sales Partners Commission,Comisiones de Ventas,
 Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor,

erpnext/translations/fr_ca.csv

@@ -1,7 +1,6 @@
 Ordered Qty,Quantité commandée,
 Price List Rate,Taux de la Liste de Prix,
 {0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Le compte {2} de type 'Profit et Perte' n'est pas admis dans une Entrée d'Ouverture,
-{0} {1}: Account {2} cannot be a Group,{0} {1}: Le compte {2} ne peut pas être un Groupe,
 {0} {1}: Account {2} does not belong to Company {3},{0} {1}: Le compte {2} ne fait pas partie de la Société {3},
 {0} {1}: Account {2} is inactive,{0} {1}: Le compte {2} est inactif,
 {0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite qu'en devise: {3},

erpnext/translations/pt_br.csv

@@ -52,7 +52,6 @@ Accounts Receivable Summary,Resumo do Contas a Receber,
 Accounts User,Usuário de Contas,
 Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.,
 Accumulated Depreciation Amount,Total de Depreciação Acumulada,
-Active Leads / Customers,Leads  Ativos / Clientes,
 Activity Cost exists for Employee {0} against Activity Type - {1},Já existe um custo da atividade para o colaborador {0} relacionado ao tipo de atividade - {1},
 Activity Cost per Employee,Custo da Atividade por Colaborador,
 Actual Qty,Qtde Real,
@@ -90,11 +89,9 @@ All Jobs,Todos as Tarefas,
 All Student Admissions,Todas Admissões de Alunos,
 All items have already been transferred for this Work Order.,Todos os itens já foram transferidos para esta Ordem de Trabalho.,
 All the mandatory Task for employee creation hasn't been done yet.,Todas as Tarefas obrigatórias para criação de colaboradores ainda não foram concluídas.,
-All these items have already been invoiced,Todos esses itens já foram faturados,
 Allocated Amount,Quantidade atribuída,
 Allocated Leaves,Licenças Alocadas,
 Allocating leaves...,Alocando licenças...,
-Allow Delete,Permitir Excluir,
 Amended From,Corrigido a partir de,
 Amount,Total,
 Amount to Bill,Valor a ser Faturado,
@@ -124,6 +121,7 @@ Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criad
 "Asset {0} cannot be scrapped, as it is already {1}","Activo {0} não pode ser descartado, uma vez que já é {1}",
 Asset {0} must be submitted,O Ativo {0} deve ser enviado,
 Assign Salary Structure,Atribuir Estrutura Salarial,
+Assign To,Atribuir a,
 Assign to Employees,Atribuir a Colaboradores,
 Assigning Structures...,Atribuir Estruturas...,
 Associate,Associado,
@@ -134,7 +132,6 @@ Attach Logo,Anexar Logo,
 Attachment,Anexos,
 Attendance,Comparecimento,
 Attendance From Date and Attendance To Date is mandatory,Data de Início do Comparecimento e Data Final de Comparecimento é obrigatória,
-Attendance Record {0} exists against Student {1},O registro de presença {0} já existe relaciolado ao Aluno {1},
 Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras,
 Attendance date can not be less than employee's joining date,Data de presença não pode ser inferior à data de admissão do colaborador,
 Attendance for employee {0} is already marked,Comparecimento para o colaborador {0} já está marcado,
@@ -172,6 +169,7 @@ Bank account cannot be named as {0},A conta bancária não pode ser nomeada como
 Banking,Bancário,
 Banking and Payments,Bancos e Pagamentos,
 Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1},
+Based On,Baseado em,
 Batch Inventory,Inventário por Lote,
 Batch No,Nº do Lote,
 Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0},
@@ -250,7 +248,6 @@ Check all,Marcar todos,
 Checkout,Finalizar Compra,
 Chemical,Químico,
 Cheques and Deposits incorrectly cleared,Cheques e depósitos apagados incorretamente,
-Child Item should not be a Product Bundle. Please remove item `{0}` and save,Criança item não deve ser um pacote de produtos. Por favor remover o item `` {0} e salvar,
 City/Town,Cidade / Município,
 Clear filters,Remover Filtros,
 Clearance Date,Data de Liberação,
@@ -301,10 +298,10 @@ Create Salary Slip,Criar Folha de Pagamento,
 Create Student Groups,Criar Grupos de Alunos,
 Create User,Criar Usuário,
 Create Users,Criar Usuários,
-Create a new Customer,Criar novo Cliente,
 "Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal.",
 Create customer quotes,Criar orçamentos de clientes,
 Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.,
+Created By,Criado por,
 Creating {0} Invoice,Criando Fatura de {0},
 Credit Balance,Saldo Credor,
 Credit Note Issued,Nota de Crédito Emitida,
@@ -349,7 +346,6 @@ Define budget for a financial year.,Defina orçamento para um ano fiscal.,
 Define various loan types,Defina vários tipos de empréstimos,
 Delay in payment (Days),Atraso no Pagamento (Dias),
 Delete all the Transactions for this Company,Apagar todas as transações para esta empresa,
-Delete permanently?,Apagar de forma permanente?,
 Delivered Amount,Quantia entregue,
 Delivered Qty,Qtde Entregue,
 Delivery Notes {0} must be cancelled before cancelling this Sales Order,A Guia de Remessa {0} deve ser cancelada antes de cancelar este Pedido de Venda,
@@ -396,6 +392,7 @@ Either target qty or target amount is mandatory.,Meta de qtde ou valor da meta s
 Electrical,elétrico,
 Electronics,eletrônica,
 Email Digest: ,Resumo por Email:,
+Email Sent,Email enviado,
 Employee,Colaborador,
 Employee Advances,Adiantamentos do Colaborador,
 Employee Benefits,Benefícios a Colaboradores,
@@ -409,7 +406,6 @@ Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.,
 Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento',
 Employee {0} already submited an apllication {1} for the payroll period {2},O colaborador {0} já enviou uma aplicação {1} para o período da folha de pagamento {2},
 Employee {0} has already applied for {1} between {2} and {3} : ,O colaborador {0} já aplicou {1} entre {2} e {3}:,
-Employee {0} has already applied for {1} on {2} : ,O colaborador {0} já solicitou {1} em {2}:,
 Employee {0} has no maximum benefit amount,Colaborador {0} não tem valor de benefício máximo,
 Employee {0} is not active or does not exist,Colaborador {0} não está ativo ou não existe,
 Employee {0} is on Leave on {1},Colaborador {0} está de licença em {1},
@@ -440,7 +436,6 @@ Expense Claim,Pedido de Reembolso de Despesas,
 Expense Claim for Vehicle Log {0},Reembolso de Despesa para o Log do Veículo {0},
 Expense Claims,Relatórios de Despesas,
 Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0},
-Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral,
 Expenses Included In Valuation,Despesas Incluídas na Avaliação,
 Expiry (In Days),Vencimento (em dias),
 Extra Large,Extra Grande,
@@ -459,7 +454,6 @@ Fiscal Year,Exercício Fiscal,
 Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0},
 Fiscal Year {0} does not exist,Ano Fiscal {0} não existe,
 Fiscal Year {0} is required,Ano Fiscal {0} é necessário,
-Fiscal Year: {0} does not exists,Ano Fiscal: {0} não existe,
 Fixed Asset,Ativo Imobilizado,
 Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Requisições de Material foram criadas automaticamente com base no nível de reposição do item,
 Food,Alimentos,
@@ -577,7 +571,6 @@ Item Variant {0} already exists with same attributes,Variant item {0} já existe
 Item Variants,Variantes dos Itens,
 Item has variants.,Item tem variantes.,
 Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão",
-Item or Warehouse for row {0} does not match Material Request,Item ou Armazén na linha {0} não corresponde à Requisição de Material,
 Item valuation rate is recalculated considering landed cost voucher amount,A taxa de avaliação é recalculada considerando o valor do comprovante do custo total do item no destino (CIF),
 Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos,
 Item {0} does not exist,Item {0} não existe,
@@ -672,7 +665,6 @@ Mark Attendance,Marcar Presença,
 Mark Half Day,Marcar Meio Período,
 Marketing,marketing,
 Marketing Expenses,Despesas com Marketing,
-"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo",
 Masters,Cadastros,
 Match Payments with Invoices,Conciliação de Pagamentos,
 Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.,
@@ -709,9 +701,7 @@ Net Change in Fixed Asset,Variação Líquida do Ativo Imobilizado,
 Net Pay,Pagamento Líquido,
 Net pay cannot be negative,Salário líquido não pode ser negativo,
 New Account Name,Nome da Nova Conta,
-New Cart,Novo Carrinho,
 New Company,Criar Empresa,
-New Contact,Novo Contato,
 New Cost Center Name,Novo Centro de Custo Nome,
 New Customer Revenue,Receita com novos clientes,
 New Customers,Clientes Novos,
@@ -735,8 +725,6 @@ No Student Groups created.,Não foi criado nenhum grupo de alunos.,
 No Work Orders created,Nenhuma ordem de trabalho criada,
 No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns,
 No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o colaborador {0} ou para as datas indicadas,
-No address added yet.,Nenhum endereço adicionado ainda.,
-No contacts added yet.,Nenhum contato adicionado ainda.,
 No description given,Nenhuma descrição informada,
 No employees for the mentioned criteria,Nenhum colaborador pelos critérios mencionados,
 No more updates,Nenhum update,
@@ -838,7 +826,6 @@ Payment Terms,Termos de Pagamento,
 Payment Terms Template,Modelo de Termos de Pagamento,
 Payment against {0} {1} cannot be greater than Outstanding Amount {2},O pagamento relacionado {0} {1} não pode ser maior do que o saldo devedor {2},
 Payroll Payable,Folha de pagamento a pagar,
-Payroll date can not be less than employee's joining date,A data da folha de pagamento não pode ser inferior à data de admissão do colaborador,
 Payslip,Holerite,
 Pending Amount,Total pendente,
 Pending Leaves,Licenças pendentes,
@@ -857,8 +844,6 @@ Please check Multi Currency option to allow accounts with other currency,"Por fa
 Please click on 'Generate Schedule',"Por favor, clique em ""Gerar Agenda""",
 Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para buscar Serial Sem adição de item {0}",
 Please click on 'Generate Schedule' to get schedule,"Por favor, clique em ""Gerar Agenda"" para obter cronograma",
-Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente de Cadastros de Vendas",
-Please create Customer from Lead {0},"Por favor, crie um Cliente a partir do Lead {0}",
 Please enable pop-ups,Por favor habilite os pop-ups,
 Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não",
 Please enter Approving Role or Approving User,"Por favor, indique Função Aprovadora ou Usuário Aprovador",
@@ -868,13 +853,11 @@ Please enter Expense Account,Por favor insira Conta Despesa,
 Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não",
 Please enter Item first,"Por favor, indique primeiro item",
 Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro",
-Please enter Material Requests in the above table,Por favor insira as Requisições de Material na tabela acima,
 Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a qtde planejada para o item {0} na linha {1}",
 Please enter Production Item first,"Por favor, indique item Produção primeiro",
 Please enter Purchase Receipt first,Digite Recibo de compra primeiro,
 Please enter Receipt Document,Por favor insira o Documento de Recibo,
 Please enter Reference date,"Por favor, indique data de referência",
-Please enter Sales Orders in the above table,"Por favor, indique os pedidos de venda na tabela acima",
 Please enter Write Off Account,"Por favor, indique a conta de abatimento",
 Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela",
 Please enter company first,Por favor insira primeira empresa,
@@ -890,7 +873,6 @@ Please mention Round Off Account in Company,"Por favor, mencione completam Conta
 Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa",
 Please mention no of visits required,O número de visitas é obrigatório,
 Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota",
-Please re-type company name to confirm,"Por favor, digite novamente o nome da empresa para confirmar",
 Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}",
 "Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira",
 Please select Apply Discount On,"Por favor, selecione Aplicar Discount On",
@@ -901,7 +883,6 @@ Please select Company,"Por favor, selecione Empresa",
 Please select Company and Party Type first,"Por favor, selecione a Empresa e Tipo de Parceiro primeiro",
 Please select Company first,"Por favor, selecione Empresa primeiro",
 Please select Employee,Selecione Colaborador,
-Please select Employee Record first.,"Por favor, selecione o registro do Colaborador primeiro.",
 Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas",
 "Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que "é o estoque item" é "Não" e "é o item Vendas" é "Sim" e não há nenhum outro pacote de produtos",
 Please select Party Type first,"Por favor, selecione o Tipo de Parceiro primeiro",
@@ -913,7 +894,6 @@ Please select a Company,"Por favor, selecione uma empresa",
 Please select a csv file,"Por favor, selecione um arquivo csv",
 Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1},
 Please select correct account,"Por favor, selecione conta correta",
-Please select customer,Selecione o cliente,
 Please select item code,Por favor selecione o código do item,
 Please select month and year,Selecione mês e ano,
 Please select prefix first,Por favor selecione o prefixo primeiro,
@@ -957,14 +937,12 @@ Price List Currency not selected,Lista de Preço Moeda não selecionado,
 Price List Rate,Preço na Lista de Preços,
 Price List master.,Cadastro da Lista de Preços.,
 Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender,
-Price List not found or disabled,Preço de tabela não encontrado ou deficientes,
 Price List {0} is disabled or does not exist,Lista de Preços {0} está desativada ou não existe,
 Pricing,Precificação,
 Pricing Rule,Regra de Preços,
 "Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca.",
 "Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios.",
 Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.,
-Primary,Primário,
 Principal Amount,Valor Principal,
 Print Settings,Configurações de Impressão,
 Private Equity,Patrimônio Líquido,
@@ -1080,7 +1058,6 @@ Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 Round Off,Arredondamento,
 Row # {0}: Batch No must be same as {1} {2},Linha # {0}: Nº do Lote deve ser o mesmo que {1} {2},
 Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível retornar mais de {1} para o item {2},
-Row # {0}: Returned Item {1} does not exists in {2} {3},Linha # {0}: Item devolvido {1} não existe em {2} {3},
 Row # {0}: Serial No is mandatory,Linha # {0}: O número de série é obrigatório,
 Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3},
 "Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser enviado, já é {2}",
@@ -1089,7 +1066,6 @@ Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantida
 Row #{0}: Please specify Serial No for Item {1},Linha # {0}: Favor especificar Sem Serial para item {1},
 Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha # {0}: O Valor deve ser o mesmo da {1}: {2} ({3} / {4}),
 "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil",
-"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil",
 Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha # {0}: Qtde rejeitada não pode ser lançada na devolução da compra,
 Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha # {0}: Armazén Rejeitado é obrigatório para o item rejeitado {1},
 Row #{0}: Set Supplier for item {1},Linha # {0}: Defina o fornecedor para o item {1},
@@ -1161,13 +1137,10 @@ Select Company...,Selecione a Empresa...,
 Select DocType,Selecione o DocType,
 Select Fiscal Year...,Selecione o Ano Fiscal ...,
 Select Items to Manufacture,Selecionar Itens para Produzir,
-Select POS Profile,Selecione o perfil do PDV,
 Select Possible Supplier,Selecione Possível Fornecedor,
 Select Warehouse...,Selecione Armazém...,
 Select an employee to get the employee advance.,Selecione um funcionário para obter o adiantamento do colaborador.,
 Select change amount account,Selecione a conta de troco,
-Select items to save the invoice,Selecione os itens para salvar a nota,
-Select or add new customer,Selecione ou adicione um novo cliente,
 Select the nature of your business.,Selecione a natureza do seu negócio.,
 Selling Amount,Valor de Venda,
 "Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}",
@@ -1289,14 +1262,12 @@ Successfully Reconciled,Reconciliados com sucesso,
 Successfully deleted all transactions related to this company!,Todas as transações relacionadas a esta empresa foram excluídas com sucesso!,
 Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos deve inteirar 100. (valor atual: {0}),
 Suplier,Fornecedor,
-Suplier Name,Nome do Fornecedor,
 Supplier Id,ID do Fornecedor,
 Supplier Invoice Date cannot be greater than Posting Date,A data da nota fiscal do fornecedor não pode ser maior do que data do lançamento,
 Supplier Invoice No,Nº da nota fiscal de compra,
 Supplier Invoice No exists in Purchase Invoice {0},Nº da Nota Fiscal do Fornecedor já existe naFatura de Compra {0},
 Supplier Part No,Nº da Peça no Fornecedor,
 Supplier Quotation,Orçamento de Fornecedor,
-Supplier Quotation {0} created,Orçamento do fornecedor {0} criado,
 Supplier Scorecard,Scorecard do Fornecedor,
 Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra,
 Supplier database.,Banco de dados do fornecedor.,
@@ -1304,8 +1275,6 @@ Support,Pós-Vendas,
 Support Analytics,Análise de Pós-Vendas,
 Support Settings,Configurações do Pós Vendas,
 Support queries from customers.,Suporte às perguntas de clientes.,
-Sync Master Data,Sincronizar com o Servidor,
-Sync Offline Invoices,Sincronizar Faturas Offline,
 System Manager,Administrador do Sistema,
 Target,Meta,
 Target On,Meta em,
@@ -1424,15 +1393,12 @@ Unsecured Loans,Empréstimos não Garantidos,
 Unsubscribe from this Email Digest,Cancelar a inscrição neste Resumo por Email,
 Unsubscribed,Inscrição Cancelada,
 Unverified Webhook Data,Dados não-confirmados do Webhook,
-Update Bank Transaction Dates,Conciliação Bancária,
 Update Cost,Atualize o custo,
-Update Email Group,Atualizar Grupo de Email,
 Update Print Format,Atualizar Formato de Impressão,
 Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.,
 Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).,
 Upper Income,Alta Renda,
 Used Leaves,Licenças Usadas,
-User Forum,Fórum de Usuários,
 User ID,ID de Usuário,
 User ID not set for Employee {0},ID de usuário não definida para Colaborador {0},
 User Remark,Observação do Usuário,
@@ -1492,7 +1458,6 @@ Working,Trabalhando,
 Workstation,Estação de Trabalho,
 Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}",
 Year start date or end date is overlapping with {0}. To avoid please set company,Ano data de início ou data de término é a sobreposição com {0}. Para evitar defina empresa,
-You are in offline mode. You will not be able to reload until you have network.,Você está em modo offline. Você não será capaz de recarregar até ter conexão.,
 You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0},
 You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar licenças em datas bloqueadas,
 You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado,
@@ -1559,13 +1524,23 @@ old_parent,old_parent,
 Chat,Chat,
 Day of Week,Dia da Semana,
 "Dear System Manager,","Caro Administrador de Sistemas,",
+Default Value,Valor padrão,
 Email Group,Grupo de Emails,
+Email Settings,Configurações de Email,
+Email not sent to {0} (unsubscribed / disabled),Email não enviado para {0} (inscrição cancelada / desativado),
 Fieldtype,FieldType,
+Help Articles,Artigo de Ajuda,
+Images,Imagens,
+Language,Idioma,
+Likes,Likes,
+Merge with existing,Mesclar com existente,
 Passive,Sem movimento,
+Percent,Por cento,
 Plant,Fábrica,
 Post,Postar,
 Postal Code,CEP,
 Read Only,Somente Leitura,
+There were errors while sending email. Please try again.,"Ocorreram erros durante o envio de email. Por favor, tente novamente.",
 Values Changed,Valores Alterados,
 Change,Alteração,
 Contact Email,Email do Contato,
@@ -1598,7 +1573,6 @@ Master,Cadastro,
 Missing Values Required,Faltando informações obrigatórias,
 Mobile No,Telefone Celular,
 Mobile Number,Telefone Celular,
-Offline,Offline,
 Open,Aberto,
 Pause,pausar,
 Quarterly,Trimestralmente,
@@ -1625,6 +1599,7 @@ View,Ver,
 Your rating:,Seu rating:,
 {0} Name,{0} Nome,
 Left,Saiu,
+Not Found,Não encontrado,
 Refresh,Atualizar,
 In Stock,Em Estoque,
 Mode Of Payment,Forma de Pagamento,
@@ -1639,6 +1614,7 @@ Customer database.,Banco de Dados de Clientes,
 Days Since Last order,Dias desde a última compra,
 End date can not be less than start date,Data final não pode ser inferior a data de início,
 From date cannot be greater than To date,A partir de data não pode ser maior que a Data,
+Group by,Agrupar por,
 In stock,Em Estoque,
 No employee found,Nenhum colaborador encontrado,
 No students found,Nenhum Aluno Encontrado,
@@ -1650,14 +1626,12 @@ Partially ordered,Parcialmente Comprados,
 Please select company first,"Por favor, selecione Empresa primeiro",
 Projected qty,Qtde Projetada,
 Serial No {0} Created,Nº de Série {0} criado,
-Set as default,Definir como padrão,
 Tax Id,CPF/CNPJ,
 To Time,Até o Horário,
 To date cannot be before from date,Até o momento não pode ser antes a partir da data,
 Upcoming Calendar Events ,Próximos Eventos do Calendário,
 Value or Qty,Valor ou Qtde,
 Write off,Abatimento,
-Write off Amount,Valor do abatimento,
 to,Para,
 Purchase Order Required,Pedido de Compra Obrigatório,
 Purchase Receipt Required,Recibo de Compra Obrigatório,
@@ -1809,7 +1783,6 @@ POS Customer Group,Grupo de Cliente PDV,
 POS Item Group,Grupo de Itens PDV,
 Update Stock,Atualizar Estoque,
 Ignore Pricing Rule,Ignorar regra de preços,
-Allow user to edit Rate,Permitir que o usuário altere o preço,
 Sales Invoice Payment,Pagamento da Fatura de Venda,
 Write Off Account,Conta de Abatimentos,
 Write Off Cost Center,Centro de custo do abatimento,
@@ -2179,7 +2152,6 @@ Leave Allocation,Alocação de Licenças,
 Send Emails At,Enviar Emails em,
 Leave Block List,Lista de Bloqueio de Licença,
 Days for which Holidays are blocked for this department.,Dias para que feriados são bloqueados para este departamento.,
-Leave Approvers,Aprovadores de Licença,
 Cellphone Number,Número do celular,
 Fleet Manager,Gerente de Frota,
 Employment Type,Tipo de Emprego,
@@ -2603,7 +2575,6 @@ Installation Time,O tempo de Instalação,
 Installation Note Item,Item da Nota de Instalação,
 Installed Qty,Qtde Instalada,
 Lead Source,Origem do Lead,
-Expense Details,Detalhes da despesa,
 "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**. \n\nThe package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.\n\nNote: BOM = Bill of Materials","Grupo agregado de Itens ** ** em outro item ** **. Isso é útil se você está empacotando um certo Itens ** ** em um pacote e você manter o estoque dos itens embalados ** ** e não o agregado ** ** item. O pacote ** ** item terá "é Stock item" como "Não" e "é o item Vendas" como "Sim". Por exemplo: Se você está vendendo Laptops e Mochilas separadamente e têm um preço especial se o cliente compra ambos, então o Laptop Backpack + será um novo item Bundle produto. Nota: BOM = Bill of Materials",
 Parent Item,Item Pai,
 List items that form the package.,Lista de itens que compõem o pacote.,
@@ -2635,8 +2606,6 @@ Default Customer Group,Grupo de Clientes padrão,
 Default Territory,Território padrão,
 Close Opportunity After Days,Fechar Oportunidade Após Dias,
 Auto close Opportunity after 15 days,Fechar automaticamente a oportunidade após 15 dias,
-Sales Order Required,Pedido de Venda Obrigatório,
-Delivery Note Required,Guia de Remessa Obrigatória,
 Allow user to edit Price List Rate in transactions,Permitir ao usuário editar Preço da Lista de Preços em transações,
 Allow multiple Sales Orders against a Customer's Purchase Order,Permitir vários Pedidos de Venda relacionados ao Pedido de Compra do Cliente,
 Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar Preço de Venda para o Item de acordo com o Valor de Compra ou Taxa de Avaliação,
@@ -2852,8 +2821,6 @@ Default Buying Cost Center,Centro de Custo Padrão de Compra,
 Default Expense Account,Conta Padrão de Despesa,
 Default Selling Cost Center,Centro de Custo Padrão de Vendas,
 Item Price,Preço do Item,
-Valid From ,Válido de,
-Valid Upto ,Válido até,
 Item Reorder,Reposição de Item,
 Check in (group),Entrada (grupo),
 Request for,Solicitado para,
@@ -2985,7 +2952,6 @@ Warehouse Detail,Detalhes do Armazén,
 Warehouse Name,Nome do Armazén,
 Warehouse Contact Info,Informações de Contato do Armazén,
 Raised By (Email),Levantadas por (Email),
-Mins to First Response,Minutos para Primeira Resposta,
 First Responded On,Primeira Resposta em,
 Resolution Details,Detalhes da Solução,
 Opening Time,Horário de Abertura,
@@ -3041,19 +3007,12 @@ Item-wise Sales Register,Registro de Vendas por Item,
 Items To Be Requested,Itens para Requisitar,
 Itemwise Recommended Reorder Level,Níves de Reposição Recomendados por Item,
 Lead Details,Detalhes do Lead,
-Lead Id,ID do Lead,
 Lead Owner Efficiency,Eficiência do Administrador do Lead,
 Maintenance Schedules,Horários de Manutenção,
 Material Requests for which Supplier Quotations are not created,"Itens Requisitados, mas não Cotados",
-Minutes to First Response for Issues,Minutos para Primeira Resposta em Incidentes,
-Minutes to First Response for Opportunity,Minutos para Primeira Resposta em Oportunidades,
 Monthly Attendance Sheet,Folha de Ponto Mensal,
 Open Work Orders,Abrir ordens de trabalho,
-Ordered Items To Be Billed,"Itens Vendidos, mas não Faturados",
-Ordered Items To Be Delivered,"Itens Vendidos, mas não Entregues",
 Qty to Deliver,Qtde para Entregar,
-Amount to Deliver,Total à Entregar,
-Delay Days,Dias de Atraso,
 Payment Period Based On Invoice Date,Prazo Médio de Pagamento Baseado na Emissão da Nota,
 Pending SO Items For Purchase Request,Itens Pendentes da Ordem de Venda por Solicitação de Compra,
 Production Analytics,Análise de Produção,
@@ -3063,15 +3022,12 @@ Project wise Stock Tracking ,Rastreio de Estoque por Projeto,
 Prospects Engaged But Not Converted,"Clientes prospectados, mas não convertidos",
 Purchase Analytics,Analítico de Compras,
 Purchase Invoice Trends,Tendência de Faturas de Compra,
-Purchase Order Items To Be Billed,"Itens Comprados, mas não Faturados",
-Purchase Order Items To Be Received,"Itens Comprados, mas não Recebidos",
 Qty to Receive,Qtde para Receber,
 Purchase Order Trends,Tendência de Pedidos de Compra,
 Purchase Receipt Trends,Tendência de Recebimentos,
 Purchase Register,Registro de Compras,
 Quotation Trends,Tendência de Orçamentos,
 Received Items To Be Billed,"Itens Recebidos, mas não Faturados",
-Requested Items To Be Ordered,"Itens Solicitados, mas não Comprados",
 Qty to Order,Qtde para Encomendar,
 Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos",
 Qty to Transfer,Qtde para Transferir,

erpnext/translations/sr_sp.csv

@@ -17,7 +17,6 @@ Accounts Receivable,Potraživanja od kupaca,
 Accounts Receivable Summary,Pregled potraživanja od kupaca,
 Accounts User,Računi korisnik,
 Active,Aktivan,
-Active Leads / Customers,Активни Леадс / Kupci,
 Activity Cost exists for Employee {0} against Activity Type - {1},Troškovi aktivnosti zaposlenog {0} na osnovu vrste aktivnosti - {1},
 Activity Cost per Employee,Troškovi aktivnosti po zaposlenom,
 Actual Qty,Trenutna kol.,
@@ -70,7 +69,6 @@ Attachment,Prilog,
 Attachments,Prilozi,
 Attendance,Prisustvo,
 Attendance From Date and Attendance To Date is mandatory,Datum početka prisustva i prisustvo do danas su obavezni,
-Attendance Record {0} exists against Student {1},Zapis o prisustvu {0} постоји kod studenata {1},
 Attendance can not be marked for future dates,Učesnik ne može biti označen za buduće datume,
 Attendance date can not be less than employee's joining date,Datum prisustva ne može biti raniji od datuma ulaska zaposlenog,
 Attendance for employee {0} is already marked,Prisustvo zaposlenog {0} je već označeno,
@@ -95,7 +93,6 @@ Cancel,Otkaži,
 Cart,Korpa,
 Cart is Empty,Korpa je prazna,
 Change Amount,Kusur,
-Change POS Profile,Promijenite POS korisnika,
 Chart Of Accounts,Kontni plan,
 Cheque/Reference No,Broj izvoda,
 Closed,Zatvoreno,
@@ -111,7 +108,6 @@ Contact,Kontakt,
 Create Employee Records,Kreirati izvještaj o Zaposlenom,
 "Create Employee records to manage leaves, expense claims and payroll","Kreiraj evidenciju o Zaposlenom kako bi upravljali odsustvom, potraživanjima za troškove i platnim spiskovima",
 Create Users,Kreiraj korisnike,
-Create a new Customer,Kreirajte novog kupca,
 Create customer quotes,Kreirajte bilješke kupca,
 Created By,Kreirao,
 Credit,Potražuje,
@@ -146,7 +142,6 @@ Difference Amount must be zero,Razlika u iznosu mora biti nula,
 Disc,Popust,
 Discount,Popust,
 Document Status,Status dokumenta,
-Documentation,Dokumentacija,
 Due Date is mandatory,Datum dospijeća je obavezan,
 Email Account,Email nalog,
 Employee,Zaposleni,
@@ -258,9 +253,7 @@ Navigating,Navigacija,
 Net Pay,Neto plaćanje,
 Net Total,Ukupno bez PDV-a,
 New Address,Nova adresa,
-New Cart,Nova korpa,
 New Company,Novo preduzeće,
-New Contact,Novi kontakt,
 New Customers,Novi kupci,
 New Employee,Novi Zaposleni,
 New Sales Invoice,Nova faktura,
@@ -269,20 +262,15 @@ New task,Novi zadatak,
 Newsletters,Newsletter-i,
 No Customers yet!,Još uvijek nema kupaca!,
 No Item with Serial No {0},Ne postoji artikal sa serijskim brojem {0},
-No Items added to cart,Nema dodatih artikala na računu,
 No Remarks,Nema napomene,
 No active or default Salary Structure found for employee {0} for the given dates,Nisu pronađene aktivne ili podrazumjevane strukture plate za Zaposlenog {0} za dati period,
-No address added yet.,Adresa još nije dodata.,
-No contacts added yet.,Još uvijek nema dodatih kontakata,
 No employees for the mentioned criteria,Za traženi kriterijum nema Zaposlenih,
 Not Paid and Not Delivered,Nije plaćeno i nije isporučeno,
 Not active,Nije aktivna,
 Not allowed to update stock transactions older than {0},Nije dozvoljeno mijenjati Promjene na zalihama starije od {0},
-Not items found,Ništa nije pronađeno,
 Note: {0},Bilješka: {0},
 Notes,Bilješke,
 On Net Total,Na ukupno bez PDV-a,
-Online,Na mreži,
 Opening,Početno stanje,
 Opening (Cr),Početno stanje (Po),
 Opening (Dr),Početno stanje (Du),
@@ -326,11 +314,8 @@ Pending Review,Čeka provjeru,
 Physician,Ljekar,
 Planned Qty,Planirana količina,
 Please enter Employee Id of this sales person,Molimo Vas da unesete ID zaposlenog prodavca,
-Please enter Sales Orders in the above table,U tabelu iznad unesite prodajni nalog,
-Please select Employee Record first.,Molimo izaberite registar Zaposlenih prvo,
 Please select Price List,Izaberite cjenovnik,
 Please select a warehouse,Izaberite skladište,
-Please select customer,Odaberite kupca,
 Please set User ID field in an Employee record to set Employee Role,Molimo podesite polje Korisnički ID u evidenciji Zaposlenih radi podešavanja zaduženja Zaposlenih,
 Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite podrazumjevanu listu praznika za Zaposlenog {0} ili Preduzeće {1},
 Please set the Date Of Joining for employee {0},Molimo podesite datum zasnivanja radnog odnosa {0},
@@ -341,11 +326,9 @@ Pre Sales,Prije prodaje,
 Price,Cijena,
 Price List,Cjenovnik,
 Price List Rate,Cijena,
-Price List not found or disabled,Cjenovnik nije pronađen ili je zaključan,
 Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji,
 Pricing,Kalkulacija,
 Pricing Rule,Pravilnik za cijene,
-Primary,Primarni,
 Primary Address Details,Detalji o primarnoj adresi,
 Primary Contact Details,Detalji o primarnom kontaktu,
 Print Settings,Podešavanje štampanja,
@@ -389,7 +372,6 @@ Reorder Qty,Kol. za dopunu,
 Report,Izvještaj,
 Report Builder,Generator izvještaja,
 Report Type,Vrsta izvještaja,
-Report an Issue,Prijavi grešku,
 Reports,Izvještaji,
 Request for Quotation,Zahtjev za ponudu,
 Request for Quotations,Zahtjev za ponude,
@@ -432,14 +414,11 @@ Sales and Returns,Prodaja i povraćaji,
 Sales campaigns.,Prodajne kampanje,
 Salutation,Titula,
 Saved,Sačuvano,
-Search Item,Pretraži artikal,
-Search Item (Ctrl + i),Pretraga artikala (Ctrl + i),
 "Search by item code, serial number, batch no or barcode","Pretraga po šifri, serijskom br. ili bar kodu",
 Select Brand...,Izaberite brend,
 Select Patient,Izaberite pacijenta,
 Select Serial Numbers,Izaberite serijske brojeve,
 Select Warehouse...,Izaberite skladište...,
-Select or add new customer,Izaberite ili dodajte novog kupca,
 Sell,Prodaja,
 Selling,Prodaja,
 Selling Amount,Prodajni iznos,
@@ -483,17 +462,13 @@ Student Attendance,Prisustvo učenika,
 Subject,Naslov,
 Submit,Potvrdi,
 Suplier,Dobavljač,
-Suplier Name,Naziv dobavljača,
 Supplier,Dobavljači,
 Supplier Invoice Date cannot be greater than Posting Date,Datum fakture dobavljača ne može biti veći od datuma otvaranja fakture,
 Supplier Invoice No,Broj fakture dobavljača,
 Supplier Invoice No exists in Purchase Invoice {0},Broj fakture dobavljača već postoji u fakturi nabavke {0},
 Supplier Name,Naziv dobavljača,
 Supplier Quotation,Ponuda dobavljača,
-Supplier Quotation {0} created,Ponuda dobavljaču {0} је kreirana,
 Support,Podrška,
-Sync Master Data,Sinhronizuj podatke iz centrale,
-Sync Offline Invoices,Sinhronizuj offline fakture,
 System Manager,Menadžer sistema,
 Tap items to add them here,Pritisnite na artikal da bi ga dodali ovdje,
 Target Warehouse,Ciljno skladište,
@@ -519,7 +494,6 @@ To Warehouse,U skladište,
 Tools,Alati,
 Total (Credit),Ukupno bez PDV-a (duguje),
 Total Amount,Ukupan iznos,
-Total Amount {0},Ukupan iznos {0},
 Total Invoiced Amount,Ukupno fakturisano,
 Total Outgoing,Ukupno isporučeno,
 Total Outstanding,Ukupno preostalo,
@@ -535,7 +509,6 @@ Tree Type,Tip stabla,
 Tree of Item Groups.,Stablo Vrste artikala,
 UOM,JM,
 Unpaid,Neplaćen,
-User Forum,Korisnički portal,
 User ID not set for Employee {0},Korisnički ID nije podešen za Zaposlenog {0},
 User Remark,Korisnička napomena,
 User {0} is already assigned to Employee {1},Korisnik {0} je već označen kao Zaposleni {1},
@@ -560,7 +533,6 @@ Weekly,Nedeljni,
 What do you need help with?,Oko čega Vam je potrebna pomoć?,
 Working,U toku,
 Year start date or end date is overlapping with {0}. To avoid please set company,Датум почетка или краја године се преклапа са {0}.  Да бисте избегли молимо поставите компанију,
-You are in offline mode. You will not be able to reload until you have network.,Радите без интернета. Нећете моћи да учитате страницу док се не повежете.,
 You are not authorized to add or update entries before {0},Немате дозволу да додајете или ажурирате ставке пре {0},
 You are not authorized to approve leaves on Block Dates,Немате дозволу да одобравате одсуства на Блок Датумима.,
 You are not authorized to set Frozen value,Немате дозволу да постављате замрзнуту вредност,
@@ -598,9 +570,12 @@ You have entered duplicate items. Please rectify and try again.,Унели ст
 "{0}: Employee email not found, hence email not sent","{0}: Email zaposlenog nije pronađena, stoga email nije poslat",
 Chat,Poruke,
 Email Group,Email grupa,
+Email Settings,Podešavanje emaila,
 ID,ID,
 Images,Slike,
 Import,Uvoz,
+Language,Jezik,
+Merge with existing,Spoji sa postojećim,
 Post,Pošalji,
 Postal Code,Poštanski broj,
 Change,Kusur,
@@ -642,7 +617,6 @@ Mobile Number,Mobilni br. telefona,
 Newsletter,Newsletter,
 Note,Bilješke,
 Notes: ,Bilješke :,
-Offline,Van mreže (offline),
 Open,Otvoren,
 Pay,Plati,
 Project,Projekti,
@@ -689,7 +663,6 @@ Serial No {0} Created,Serijski broj {0} kreiran,
 Tax Id,Poreski broj,
 Upcoming Calendar Events ,Predstojeći događaji u kalendaru,
 Write off,Otpisati,
-Write off Amount,Zaokruženi iznos,
 received from,je primljen od,
 Purchase Receipt Required,Prijem robe je obavezan,
 Requested,Tražena,
@@ -862,7 +835,6 @@ Hour,Sat,
 Mobile,Mobilni,
 Patient Name,Ime pacijenta,
 Employee name and designation in print,Ime i pozicija Zaposlenog,
-Lab Test Groups,Labaratorijske grupe,
 Patient Details,Detalji o pacijentu,
 Patient Age,Starost pacijenta,
 Weight (In Kilogram),Težina (u kg),
@@ -954,8 +926,6 @@ Partly Delivered,Djelimično isporučeno,
 Delivery Warehouse,Skladište dostave,
 Default Customer Group,Podrazumijevana grupa kupaca,
 Default Territory,Podrazumijevana država,
-Sales Order Required,Prodajni nalog je obavezan,
-Delivery Note Required,Otpremnica je obavezna,
 Allow multiple Sales Orders against a Customer's Purchase Order,Dozvolite više prodajnih naloga koji su vezani sa porudžbenicom kupca,
 All Customer Contact,Svi kontakti kupca,
 All Employee (Active),Svi zaposleni (aktivni),
@@ -1026,7 +996,6 @@ Total Projected Qty,Ukupna projektovana količina,
 Default Supplier,Podrazumijevani dobavljač,
 Default Selling Cost Center,Podrazumijevani centar troškova,
 Item Price,Cijena artikla,
-Valid From ,Važi od,
 Item Reorder,Dopuna artikla,
 Purchase Receipt Item,Stavka Prijema robe,
 Purchase Receipts,Prijemi robe,
@@ -1078,14 +1047,12 @@ Item Shortage Report,Izvještaj o negativnim zalihama,
 Item-wise Sales Register,Prodaja po artiklima,
 Itemwise Recommended Reorder Level,Pregled preporučenih nivoa dopune,
 Monthly Attendance Sheet,Mjesečni list prisustva,
-Ordered Items To Be Billed,Poručeni artikli za fakturisanje,
 Profit and Loss Statement,Bilans uspjeha,
 Profitability Analysis,Analiza profitabilnosti,
 Purchase Analytics,Analiza nabavke,
 Purchase Invoice Trends,Trendovi faktura dobavljaća,
 Purchase Order Trends,Trendovi kupovina,
 Purchase Receipt Trends,Trendovi prijema robe,
-Requested Items To Be Ordered,Tražene stavke za isporuku,
 Sales Analytics,Prodajna analitika,
 Sales Invoice Trends,Trendovi faktura prodaje,
 Sales Order Trends,Trendovi prodajnih naloga,