Merge branch 'develop'

Fixes

erpnext/__version__.py

@@ -1 +1,2 @@
-__version__ = '4.21.3'
+from __future__ import unicode_literals
+__version__ = '4.22.2'

erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
+from __future__ import unicode_literals
 
 import frappe
-test_records = frappe.get_test_records('Budget Distribution')
+test_records = frappe.get_test_records('Budget Distribution')

erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 account_properties = {
 	"Deutscher Kontenplan SKR03": {
 		"Bilanzkonten": {

erpnext/accounts/doctype/cost_center/test_cost_center.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/accounts/doctype/pos_setting/test_pos_setting.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -59,6 +59,7 @@ class SalesInvoice(SellingController):
 
 		if cint(self.update_stock):
 			self.validate_item_code()
+			self.validate_warehouse()
 			self.update_current_stock()
 			self.validate_delivery_note()
 
@@ -350,6 +351,11 @@ class SalesInvoice(SellingController):
 			if not d.item_code:
 				msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True)
 
+	def validate_warehouse(self):
+		for d in self.get('entries'):
+			if not d.warehouse:
+				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
+
 	def validate_delivery_note(self):
 		for d in self.get("entries"):
 			if d.delivery_note:

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest, json, copy

erpnext/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/accounts/report/financial_statements.py

@@ -161,7 +161,8 @@ def add_total_row(out, balance_must_be, period_list):
 def get_accounts(company, root_type):
 	# root lft, rgt
 	root_account = frappe.db.sql("""select lft, rgt from `tabAccount`
-		where company=%s and root_type=%s order by lft limit 1""",
+		where company=%s and root_type=%s and ifnull(parent_account, '') = ''
+		order by lft limit 1""",
 		(company, root_type), as_dict=True)
 
 	if not root_account:

erpnext/buying/doctype/supplier/test_supplier.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/config/accounts.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/buying.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/desktop.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/hr.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/manufacturing.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/projects.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/selling.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/setup.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 from frappe.widgets.moduleview import add_setup_section
 

erpnext/config/stock.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/support.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/controllers/selling_controller.py

@@ -391,6 +391,7 @@ class SellingController(StockController):
 					'qty': d.qty,
 					'reserved_qty': reserved_qty_for_main_item,
 					'uom': d.stock_uom,
+                                        'stock_uom': d.stock_uom,
 					'batch_no': cstr(d.get("batch_no")).strip(),
 					'serial_no': cstr(d.get("serial_no")).strip(),
 					'name': d.name

erpnext/controllers/tests/test_recurring_document.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import frappe.permissions

erpnext/hooks.py

@@ -1,10 +1,11 @@
+from __future__ import unicode_literals
 app_name = "erpnext"
 app_title = "ERPNext"
 app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "4.21.3"
+app_version = "4.22.2"
 
 error_report_email = "support@erpnext.com"
 

erpnext/hr/doctype/attendance/test_attendance.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/branch/test_branch.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/deduction_type/test_deduction_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/department/test_department.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_ignore = ["Leave Block List"]
 

erpnext/hr/doctype/designation/test_designation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/earning_type/test_earning_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/employee/test_employee.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/employment_type/test_employment_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/expense_claim/test_expense_claim.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/holiday_list/test_holiday_list.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/leave_allocation/test_leave_allocation.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 test_records = frappe.get_test_records('Leave Allocation')

erpnext/hr/doctype/leave_application/test_leave_application.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/leave_block_list/test_leave_block_list.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/leave_type/test_leave_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/salary_slip/test_salary_slip.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import unittest
 import frappe

erpnext/hr/doctype/salary_structure/test_salary_structure.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/manufacturing/doctype/bom/bom.py

@@ -395,30 +395,23 @@ def get_bom_items_as_dict(bom, qty=1, fetch_exploded=1):
 				item.expense_account as expense_account,
 				item.buying_cost_center as cost_center
 			from
-				`tab%(table)s` bom_item, `tabBOM` bom, `tabItem` item
+				`tab{table}` bom_item, `tabBOM` bom, `tabItem` item
 			where
 				bom_item.parent = bom.name
 				and bom_item.docstatus < 2
-				and bom_item.parent = "%(bom)s"
+				and bom_item.parent = %(bom)s
 				and item.name = bom_item.item_code
-				%(conditions)s
+				{conditions}
 				group by item_code, stock_uom"""
 
 	if fetch_exploded:
-		items = frappe.db.sql(query % {
-			"qty": qty,
-			"table": "BOM Explosion Item",
-			"bom": bom,
-			"conditions": """and ifnull(item.is_pro_applicable, 'No') = 'No'
-					and ifnull(item.is_sub_contracted_item, 'No') = 'No' """
-		}, as_dict=True)
+		query = query.format(table="BOM Explosion Item",
+			conditions="""and ifnull(item.is_pro_applicable, 'No') = 'No'
+				and ifnull(item.is_sub_contracted_item, 'No') = 'No' """)
+		items = frappe.db.sql(query, { "qty": qty,	"bom": bom }, as_dict=True)
 	else:
-		items = frappe.db.sql(query % {
-			"qty": qty,
-			"table": "BOM Item",
-			"bom": bom,
-			"conditions": ""
-		}, as_dict=True)
+		query = query.format(table="BOM Item", conditions="")
+		items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
 
 	# make unique
 	for item in items:

erpnext/manufacturing/doctype/workstation/test_workstation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/patches.txt

@@ -93,3 +93,4 @@ erpnext.patches.v4_2.recalculate_bom_costs
 erpnext.patches.v4_2.discount_amount
 erpnext.patches.v4_2.update_landed_cost_voucher
 erpnext.patches.v4_2.set_item_has_batch
+erpnext.patches.v4_2.update_stock_uom_for_dn_in_sle

erpnext/patches/v4_0/fix_contact_address.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_0/new_address_template.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_0/rename_sitemap_to_route.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 import frappe.model
 

erpnext/patches/v4_2/default_website_style.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 from frappe.templates.pages.style_settings import default_properties
 

erpnext/patches/v4_2/update_project_milestones.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_2/update_sales_order_invoice_field_name.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_2/update_stock_uom_for_dn_in_sle.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.sql("""update `tabStock Ledger Entry` sle, tabItem item
+		set sle.stock_uom = item.stock_uom
+		where sle.voucher_type="Delivery Note" and item.name = sle.item_code
+		and sle.stock_uom != item.stock_uom""")

erpnext/projects/doctype/activity_type/test_activity_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/projects/doctype/project/test_project.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/projects/doctype/task/test_task.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/projects/doctype/time_log/test_time_log.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/projects/doctype/time_log_batch/test_time_log_batch.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe import _

erpnext/selling/doctype/campaign/test_campaign.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/selling/doctype/industry_type/test_industry_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/selling/doctype/opportunity/test_opportunity.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/selling/doctype/quotation/test_quotation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe, json
 from frappe.utils import flt

erpnext/selling/doctype/sales_bom/test_sales_bom.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/selling/doctype/sales_order/test_sales_order.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe.utils import flt

erpnext/setup/doctype/authorization_control/authorization_control.py

@@ -94,6 +94,9 @@ class AuthorizationControl(TransactionBase):
 			self.validate_auth_rule(doctype_name, auth_value, based_on, add_cond, company)
 
 	def validate_approving_authority(self, doctype_name,company, total, doc_obj = ''):
+		if not frappe.db.count("Authorization Rule"):
+			return
+
 		av_dis = 0
 		if doc_obj:
 			price_list_rate, base_rate = 0, 0

erpnext/setup/doctype/brand/test_brand.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/company/test_company.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_ignore = ["Account", "Cost Center"]
 

erpnext/setup/doctype/country/test_country.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/currency/test_currency.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 # pre loaded
 

erpnext/setup/doctype/currency_exchange/test_currency_exchange.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/customer_group/test_customer_group.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_ignore = ["Price List"]
 

erpnext/setup/doctype/print_heading/test_print_heading.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/sales_partner/test_sales_partner.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/sales_person/test_sales_person.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_dependencies = ["Employee"]
 

erpnext/setup/doctype/supplier_type/test_supplier_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/territory/test_territory.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/uom/test_uom.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/stock/doctype/batch/test_batch.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe.exceptions import ValidationError

erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py

@@ -52,7 +52,7 @@ class StockLedgerEntry(Document):
 			frappe.throw(_("Actual Qty is mandatory"))
 
 	def validate_item(self):
-		item_det = frappe.db.sql("""select name, has_batch_no, docstatus, is_stock_item
+		item_det = frappe.db.sql("""select name, has_batch_no, docstatus, is_stock_item, stock_uom
 			from tabItem where name=%s""", self.item_code, as_dict=True)[0]
 
 		if item_det.is_stock_item != 'Yes':

erpnext/stock/doctype/warehouse/test_warehouse.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/stock/get_item_details.py

@@ -144,16 +144,13 @@ def get_basic_details(args, item_doc):
 		"warehouse": user_default_warehouse or args.warehouse or item.default_warehouse,
 		"income_account": (item.income_account
 			or args.income_account
-			or frappe.db.get_value("Item Group", item.item_group, "default_income_account")
-			or frappe.db.get_value("Company", args.company, "default_income_account")),
+			or frappe.db.get_value("Item Group", item.item_group, "default_income_account")),
 		"expense_account": (item.expense_account
 			or args.expense_account
-			or frappe.db.get_value("Item Group", item.item_group, "default_expense_account")
-			or frappe.db.get_value("Company", args.company, "default_expense_account")),
+			or frappe.db.get_value("Item Group", item.item_group, "default_expense_account")),
 		"cost_center": (frappe.db.get_value("Project", args.project_name, "cost_center")
 			or (item.selling_cost_center if args.transaction_type == "selling" else item.buying_cost_center)
-			or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
-			or frappe.db.get_value("Company", args.company, "cost_center")),
+			or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")),
 		"batch_no": None,
 		"item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in
 			item_doc.get("item_tax")))),
@@ -171,6 +168,13 @@ def get_basic_details(args, item_doc):
 		"discount_percentage": 0.0
 	})
 
+	# if default specified in item is for another company, fetch from company
+	for d in [["Account", "income_account", "default_income_account"], ["Account", "expense_account", "default_expense_account"],
+		["Cost Center", "cost_center", "cost_center"], ["Warehouse", "warehouse", ""]]:
+			company = frappe.db.get_value(d[0], out.get(d[1]), "company")
+			if not out[d[1]] or (company and args.company != company):
+				out[d[1]] = frappe.db.get_value("Company", args.company, d[2]) if d[2] else None
+
 	for fieldname in ("item_name", "item_group", "barcode", "brand", "stock_uom"):
 		out[fieldname] = item.get(fieldname)
 

erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe import _

erpnext/stock/report/stock_balance/stock_balance.py

@@ -22,7 +22,7 @@ def execute(filters=None):
 					item_map[item]["item_group"],
 					item_map[item]["brand"],
 					item_map[item]["description"], wh,
-					qty_dict.uom, qty_dict.opening_qty,
+					item_map[item]["stock_uom"], qty_dict.opening_qty,
 					qty_dict.opening_val, qty_dict.in_qty,
 					qty_dict.in_val, qty_dict.out_qty,
 					qty_dict.out_val, qty_dict.bal_qty,
@@ -36,7 +36,7 @@ def get_columns(filters):
 	"""return columns based on filters"""
 
 	columns = ["Item:Link/Item:100", "Item Name::150", "Item Group::100", "Brand::90", \
-	"Description::140", "Warehouse:Link/Warehouse:100", "Stock UOM::90", "Opening Qty:Float:100", \
+	"Description::140", "Warehouse:Link/Warehouse:100", "Stock UOM:Link/UOM:90", "Opening Qty:Float:100", \
 	"Opening Value:Float:110", "In Qty:Float:80", "In Value:Float:80", "Out Qty:Float:80", \
 	"Out Value:Float:80", "Balance Qty:Float:100", "Balance Value:Float:100", \
 	"Valuation Rate:Float:90", "Company:Link/Company:100"]
@@ -59,7 +59,7 @@ def get_conditions(filters):
 def get_stock_ledger_entries(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select item_code, warehouse, posting_date, actual_qty, valuation_rate,
-	stock_uom, company, voucher_type, qty_after_transaction, stock_value_difference
+	company, voucher_type, qty_after_transaction, stock_value_difference
 		from `tabStock Ledger Entry`
 		where docstatus < 2 %s order by posting_date, posting_time, name""" %
 		conditions, as_dict=1)
@@ -78,7 +78,6 @@ def get_item_warehouse_map(filters):
 				"val_rate": 0.0, "uom": None
 			}))
 		qty_dict = iwb_map[d.company][d.item_code][d.warehouse]
-		qty_dict.uom = d.stock_uom
 
 		if d.voucher_type == "Stock Reconciliation":
 			qty_diff = flt(d.qty_after_transaction) - qty_dict.bal_qty
@@ -106,7 +105,7 @@ def get_item_warehouse_map(filters):
 
 def get_item_details(filters):
 	item_map = {}
-	for d in frappe.db.sql("select name, item_name, item_group, brand, \
+	for d in frappe.db.sql("select name, item_name, stock_uom, item_group, brand, \
 		description from tabItem", as_dict=1):
 		item_map.setdefault(d.name, d)
 

erpnext/stock/utils.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
+from __future__ import unicode_literals
 import frappe
 from frappe import _
 import json

erpnext/support/doctype/newsletter/test_newsletter.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

erpnext/support/doctype/support_ticket/test_support_ticket.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/translations/ar.csv

@@ -37,7 +37,7 @@ A Customer Group exists with same name please change the Customer name or rename
 A Customer exists with same name,يوجد في قائمة العملاء عميل بنفس الاسم
 A Lead with this email id should exist,وينبغي أن يكون هذا المعرف الرصاص مع البريد الإلكتروني موجود
 A Product or Service,منتج أو خدمة
-A Supplier exists with same name,وهناك مورد موجود مع نفس الاسم
+A Supplier exists with same name,اسم المورد موجود مسبقا 
 A symbol for this currency. For e.g. $,رمزا لهذه العملة. على سبيل المثال ل$
 AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 Abbr,ابر
@@ -85,7 +85,7 @@ Accounting,المحاسبة
 "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",قيد محاسبي المجمدة تصل إلى هذا التاريخ، لا أحد يمكن أن تفعل / تعديل إدخال باستثناء دور المحددة أدناه.
 Accounting journal entries.,المحاسبة إدخالات دفتر اليومية.
 Accounts,حسابات
-Accounts Browser,متصفح الحسابات
+Accounts Browser,متصفح الحسابات 
 Accounts Frozen Upto,حسابات مجمدة حتي
 Accounts Payable,ذمم دائنة
 Accounts Receivable,حسابات القبض
@@ -102,7 +102,7 @@ Actual Completion Date,تاريخ الإنتهاء الفعلي
 Actual Date,التاريخ الفعلي
 Actual End Date,تاريخ الإنتهاء الفعلي
 Actual Invoice Date,التاريخ الفعلي للفاتورة
-Actual Posting Date,تاريخ النشر الفعلي
+Actual Posting Date,تاريخ الترحيل الفعلي
 Actual Qty,الكمية الفعلية
 Actual Qty (at source/target),الكمية الفعلية (في المصدر / الهدف)
 Actual Qty After Transaction,الكمية الفعلية بعد العملية
@@ -121,8 +121,8 @@ Add to Cart,إضافة إلى العربة
 Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 Add/Remove Recipients,إضافة / إزالة المستلمين
 Address,عنوان
-Address & Contact,معالجة والاتصال
-Address & Contacts,عنوان واتصالات
+Address & Contact,معلومات الاتصال والعنوان
+Address & Contacts,معلومات الاتصال والعنوان
 Address Desc,معالجة التفاصيل
 Address Details,تفاصيل العنوان
 Address HTML,معالجة HTML
@@ -253,8 +253,8 @@ Approving Role,الموافقة على دور
 Approving Role cannot be same as role the rule is Applicable To,الموافقة دور لا يمكن أن يكون نفس دور القاعدة تنطبق على
 Approving User,الموافقة العضو
 Approving User cannot be same as user the rule is Applicable To,الموافقة العضو لا يمكن أن يكون نفس المستخدم القاعدة تنطبق على
-Are you sure you want to STOP ,Are you sure you want to STOP
-Are you sure you want to UNSTOP ,Are you sure you want to UNSTOP
+Are you sure you want to STOP ,Are you sure you want to STOP 
+Are you sure you want to UNSTOP ,Are you sure you want to UNSTOP 
 Arrear Amount,متأخرات المبلغ
 "As Production Order can be made for this item, it must be a stock item.",كما يمكن أن يتم ترتيب الإنتاج لهذا البند، يجب أن يكون بند الأوراق المالية .
 As per Stock UOM,وفقا للأوراق UOM
@@ -283,7 +283,7 @@ Auto Accounting For Stock Settings,السيارات المحاسبة المال
 Auto Material Request,السيارات مادة طلب
 Auto-raise Material Request if quantity goes below re-order level in a warehouse,لصناعة السيارات في رفع طلب المواد إذا كمية يذهب دون مستوى إعادة الطلب في مستودع
 Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
-Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box
+Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box 
 Automatically extract Leads from a mail box e.g.,استخراج الشراء تلقائيا من صندوق البريد على سبيل المثال
 Automatically updated via Stock Entry of type Manufacture/Repack,تحديثها تلقائيا عن طريق إدخال الأسهم الصنع نوع / أعد حزم
 Automotive,السيارات
@@ -325,7 +325,7 @@ Bank,مصرف
 Bank / Cash Account,البنك حساب / النقدية
 Bank A/C No.,رقم الحساب المصرفي.
 Bank Account,الحساب المصرفي
-Bank Account No.,البنك رقم الحساب
+Bank Account No.,رقم الحساب في البك
 Bank Accounts,الحسابات المصرفية
 Bank Clearance Summary,بنك ملخص التخليص
 Bank Draft,البنك مشروع
@@ -334,7 +334,7 @@ Bank Overdraft Account,حساب السحب على المكشوف المصرفي
 Bank Reconciliation,تسوية البنك
 Bank Reconciliation Detail,تفاصيل تسوية البنك
 Bank Reconciliation Statement,بيان تسوية البنك
-Bank Voucher,البنك قسيمة
+Bank Voucher,قسيمة البنك
 Bank/Cash Balance,بنك / النقد وما في حكمه
 Banking,مصرفي
 Barcode,الباركود
@@ -349,14 +349,14 @@ Batch,دفعة
 Batch (lot) of an Item.,دفعة (الكثير) من عنصر.
 Batch Finished Date,دفعة منتهية تاريخ
 Batch ID,دفعة ID
-Batch No,لا دفعة
+Batch No,رقم دفعة
 Batch Started Date,كتبت دفعة تاريخ
 Batch Time Logs for billing.,سجلات ترتبط بفترات زمنية لإعداد الفواتير.
 Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
 Batched for Billing,دفعات عن الفواتير
 Better Prospects,آفاق أفضل
-Bill Date,مشروع القانون تاريخ
-Bill No,مشروع القانون لا
+Bill Date,تاريخ الفاتورة
+Bill No,رقم الفاتورة
 Bill No {0} already booked in Purchase Invoice {1},مشروع القانون لا { 0 ​​} حجزت بالفعل في شراء الفاتورة {1}
 Bill of Material,فاتورة المواد
 Bill of Material to be considered for manufacturing,فاتورة المواد التي سينظر فيها لتصنيع
@@ -372,7 +372,7 @@ Billing Status,الحالة الفواتير
 Bills raised by Suppliers.,رفعت فواتير من قبل الموردين.
 Bills raised to Customers.,رفعت فواتير للعملاء.
 Bin,بن
-Bio,الحيوية
+Bio,نبذة
 Biotechnology,التكنولوجيا الحيوية
 Birthday,عيد ميلاد
 Block Date,منع تاريخ
@@ -410,8 +410,8 @@ Buying Settings,إعدادات الشراء
 "Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 C-Form,نموذج C-
 C-Form Applicable,C-نموذج قابل للتطبيق
-C-Form Invoice Detail, تفاصيل الفاتورة نموذج - س
-C-Form No,رقم النموذج - س
+C-Form Invoice Detail, تفاصيل الفاتورة نموذج - س 
+C-Form No,رقم النموذج - س 
 C-Form records,سجلات النموذج - س
 CENVAT Capital Goods,CENVAT السلع الرأسمالية
 CENVAT Edu Cess,CENVAT ايدو سيس
@@ -510,8 +510,8 @@ Clearance Date,إزالة التاريخ
 Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
 Clearance date cannot be before check date in row {0},تاريخ التخليص لا يمكن أن يكون قبل تاريخ الاختيار في الصف {0}
 Click on 'Make Sales Invoice' button to create a new Sales Invoice.,انقر على 'جعل مبيعات الفاتورة "الزر لإنشاء فاتورة مبيعات جديدة.
-Click on a link to get options to expand get options ,Click on a link to get options to expand get options
-Client,عميل
+Click on a link to get options to expand get options ,Click on a link to get options to expand get options 
+Client,عميل	
 Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
 Closed,مغلق
 Closing (Cr),إغلاق (الكروم)
@@ -840,13 +840,13 @@ Distributor,موزع
 Divorced,المطلقات
 Do Not Contact,عدم الاتصال
 Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات.
-Do really want to unstop production order: ,Do really want to unstop production order:
-Do you really want to STOP ,Do you really want to STOP
+Do really want to unstop production order: ,Do really want to unstop production order: 
+Do you really want to STOP ,Do you really want to STOP 
 Do you really want to STOP this Material Request?,هل تريد حقا لوقف هذا طلب المواد ؟
 Do you really want to Submit all Salary Slip for month {0} and year {1},هل تريد حقا لتقديم كل زلة الرواتب ل شهر {0} و السنة {1}
-Do you really want to UNSTOP ,Do you really want to UNSTOP
+Do you really want to UNSTOP ,Do you really want to UNSTOP 
 Do you really want to UNSTOP this Material Request?,هل تريد حقا أن نزع السدادة هذا طلب المواد ؟
-Do you really want to stop production order: ,Do you really want to stop production order:
+Do you really want to stop production order: ,Do you really want to stop production order: 
 Doc Name,اسم الوثيقة
 Doc Type,نوع الوثيقة
 Document Description,وصف الوثيقة
@@ -898,7 +898,7 @@ Electronics,إلكترونيات
 Email,البريد الإلكتروني
 Email Digest,البريد الإلكتروني دايجست
 Email Digest Settings,البريد الإلكتروني إعدادات دايجست
-Email Digest: ,Email Digest:
+Email Digest: ,Email Digest: 
 Email Id,البريد الإلكتروني معرف
 "Email Id where a job applicant will email e.g. ""jobs@example.com""",معرف البريد الإلكتروني حيث طالب العمل سوف البريد الإلكتروني على سبيل المثال "jobs@example.com"
 Email Notifications,إشعارات البريد الإلكتروني
@@ -958,7 +958,7 @@ Enter url parameter for receiver nos,أدخل عنوان URL لمعلمة NOS ا
 Entertainment & Leisure,الترفيه وترفيهية
 Entertainment Expenses,مصاريف الترفيه
 Entries,مقالات
-Entries against ,Entries against
+Entries against ,Entries against 
 Entries are not allowed against this Fiscal Year if the year is closed.,لا يسمح مقالات ضد السنة المالية الحالية إذا تم إغلاق السنة.
 Equity,إنصاف
 Error: {0} > {1},الخطأ: {0} > {1}
@@ -1573,7 +1573,7 @@ Maintenance Visit Purpose,صيانة زيارة الغرض
 Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 Maintenance start date can not be before delivery date for Serial No {0},صيانة تاريخ بداية لا يمكن أن يكون قبل تاريخ التسليم لل رقم المسلسل {0}
 Major/Optional Subjects,الرئيسية / اختياري الموضوعات
-Make ,Make
+Make ,Make 
 Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
 Make Bank Voucher,جعل قسيمة البنك
 Make Credit Note,جعل الائتمان ملاحظة
@@ -1722,7 +1722,7 @@ Net Weight UOM,الوزن الصافي UOM
 Net Weight of each Item,الوزن الصافي لكل بند
 Net pay cannot be negative,صافي الأجور لا يمكن أن تكون سلبية
 Never,أبدا
-New ,New
+New ,New 
 New Account,حساب جديد
 New Account Name,اسم الحساب الجديد
 New BOM,BOM جديدة
@@ -2448,7 +2448,7 @@ Rounded Off,تقريبها
 Rounded Total,تقريب إجمالي
 Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
 Row # ,الصف #
-Row # {0}: ,Row # {0}:
+Row # {0}: ,Row # {0}: 
 Row #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,الصف # {0}: الكمية المطلوبة لا يمكن أن أقل من الحد الأدنى الكمية النظام القطعة (المحددة في البند الرئيسي).
 Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
 Row {0}: Account does not match with \						Purchase Invoice Credit To account,الصف {0}: الحساب لا يتطابق مع \ شراء فاتورة الائتمان لحساب
@@ -2464,7 +2464,7 @@ Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون
 Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 Rules for applying pricing and discount.,قواعد لتطبيق التسعير والخصم .
 Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
-S.O. No.,S.O. لا.
+S.O. No.,S.O. رقم
 SHE Cess on Excise,SHE سيس على المكوس
 SHE Cess on Service Tax,SHE سيس على ضريبة الخدمة
 SHE Cess on TDS,SHE سيس على TDS
@@ -2477,17 +2477,17 @@ SMS Settings,SMS إعدادات
 SO Date,SO تاريخ
 SO Pending Qty,وفي انتظار SO الكمية
 SO Qty,SO الكمية
-Salary,راتب
+Salary,الراتب
 Salary Information,معلومات الراتب
-Salary Manager,راتب مدير
+Salary Manager,راتب المدير
 Salary Mode,وضع الراتب
-Salary Slip,الراتب زلة
+Salary Slip,إيصال الراتب
 Salary Slip Deduction,زلة الراتب خصم
-Salary Slip Earning,زلة الراتب كسب
-Salary Slip of employee {0} already created for this month,راتب الموظف زلة ل {0} تم إنشاؤها مسبقا لهذا الشهر
+Salary Slip Earning,مسير الرواتب /الكسب
+Salary Slip of employee {0} already created for this month,إيصال راتب الموظف تم إنشاؤها مسبقا لهذا الشهر 
 Salary Structure,هيكل المرتبات
-Salary Structure Deduction,هيكل المرتبات خصم
-Salary Structure Earning,هيكل الرواتب كسب
+Salary Structure Deduction,هيكل المرتبات / الخصومات
+Salary Structure Earning,هيكل المرتبات / الكسب
 Salary Structure Earnings,إعلانات الأرباح الراتب هيكل
 Salary breakup based on Earning and Deduction.,تفكك الراتب على أساس الكسب وخصم.
 Salary components.,الراتب المكونات.
@@ -2499,7 +2499,7 @@ Sales BOM Help,مبيعات BOM تعليمات
 Sales BOM Item,مبيعات السلعة BOM
 Sales BOM Items,عناصر مبيعات BOM
 Sales Browser,متصفح المبيعات
-Sales Details,مبيعات تفاصيل
+Sales Details,تفاصيل المبيعات
 Sales Discounts,مبيعات خصومات
 Sales Email Settings,إعدادات البريد الإلكتروني مبيعات
 Sales Expenses,مصاريف المبيعات
@@ -2544,7 +2544,7 @@ Sales Team,فريق المبيعات
 Sales Team Details,تفاصيل فريق المبيعات
 Sales Team1,مبيعات Team1
 Sales and Purchase,المبيعات والمشتريات
-Sales campaigns.,حملات المبيعات.
+Sales campaigns.,حملات المبيعات
 Salutation,تحية
 Sample Size,حجم العينة
 Sanctioned Amount,يعاقب المبلغ
@@ -2750,7 +2750,7 @@ Stock Ageing,الأسهم شيخوخة
 Stock Analytics,الأسهم تحليلات
 Stock Assets,الموجودات الأسهم
 Stock Balance,الأسهم الرصيد
-Stock Entries already created for Production Order ,Stock Entries already created for Production Order
+Stock Entries already created for Production Order ,Stock Entries already created for Production Order 
 Stock Entry,الأسهم الدخول
 Stock Entry Detail,الأسهم إدخال التفاصيل
 Stock Expenses,مصاريف الأسهم
@@ -3300,24 +3300,24 @@ website page link,الموقع رابط الصفحة
 {0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} ضد مركز التكلفة {2} سيتجاوز التي كتبها {3}
 {0} can not be negative,{0} لا يمكن أن تكون سلبية
 {0} created,{0} خلق
-{0} does not belong to Company {1},{0} {لا تنتمي إلى شركة {1
+{0} does not belong to Company {1},{0} لا تنتمي إلى شركة {1}
 {0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة المدينة
 {0} is an invalid email address in 'Notification Email Address',"{0} هو عنوان بريد إلكتروني غير صالح في ' عنوان البريد الإلكتروني إعلام """
 {0} is mandatory,{0} إلزامي
-{0} is mandatory for Item {1},{0} {إلزامي القطعة ل {1
+{0} is mandatory for Item {1},{0} إلزامي القطعة ل {1}
 {0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
 {0} is not a stock Item,{0} ليس الأسهم الإغلاق
 {0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة لل تفاصيل {1}
-{0} is not a valid Leave Approver. Removing row #{1}.,{0} {ليس صحيحا اترك الموافق. إزالة الصف # {1.
+{0} is not a valid Leave Approver. Removing row #{1}.,{0} ليس صحيحا اترك الموافق. إزالة الصف # {1}.
 {0} is not a valid email id,{0} ليس معرف بريد إلكتروني صحيح
 {0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} الآن الافتراضي السنة المالية. يرجى تحديث المتصفح ل التغيير نافذ المفعول .
 {0} is required,{0} مطلوب
 {0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون البند شراؤها أو التعاقد الفرعي في الصف {1}
 {0} must be reduced by {1} or you should increase overflow tolerance,{0} يجب تخفيض كتبها {1} أو يجب زيادة الفائض التسامح
 {0} must have role 'Leave Approver',{0} يجب أن يكون دور ' اترك الموافق '
-{0} valid serial nos for Item {1},{0} {غ المسلسل صالحة لل تفاصيل {1
-{0} {1} against Bill {2} dated {3},{0} {1} {ضد بيل {2} بتاريخ {3
-{0} {1} against Invoice {2},{0} {1} {ضد الفاتورة {2
+{0} valid serial nos for Item {1},{0} غ المسلسل صالحة لل تفاصيل {1}
+{0} {1} against Bill {2} dated {3},{0} {1} ضد بيل {2} بتاريخ {3}
+{0} {1} against Invoice {2},{0} {1} ضد الفاتورة {2}
 {0} {1} has already been submitted,{0} {1} وقد تم بالفعل قدمت
 {0} {1} has been modified. Please refresh.,{0} {1} تم تعديل . يرجى تحديث.
 {0} {1} is not submitted,{0} {1} لا تقدم

erpnext/translations/el.csv

@@ -255,7 +255,7 @@ Approving Role cannot be same as role the rule is Applicable To,"Έγκριση
 Approving User,Έγκριση χρήστη
 Approving User cannot be same as user the rule is Applicable To,Την έγκριση του χρήστη δεν μπορεί να είναι ίδιο με το χρήστη ο κανόνας ισχύει για
 Are you sure you want to STOP ,Είσαστε σίγουροι πως θέλετε να σταματήσετε
-Are you sure you want to UNSTOP ,Are you sure you want to UNSTOP
+Are you sure you want to UNSTOP ,Are you sure you want to UNSTOP 
 Arrear Amount,Καθυστερήσεις Ποσό
 "As Production Order can be made for this item, it must be a stock item.","Όπως μπορεί να γίνει Παραγωγής παραγγελίας για το συγκεκριμένο προϊόν , θα πρέπει να είναι ένα στοιχείο υλικού."
 As per Stock UOM,Όπως ανά Διαθέσιμο UOM
@@ -284,7 +284,7 @@ Auto Accounting For Stock Settings,Auto Λογιστικά Για Ρυθμίσε
 Auto Material Request,Αυτόματη Αίτηση Υλικού
 Auto-raise Material Request if quantity goes below re-order level in a warehouse,Auto-raise Αίτηση Υλικό εάν η ποσότητα πέσει κάτω εκ νέου για το επίπεδο σε μια αποθήκη
 Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
-Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box
+Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box 
 Automatically extract Leads from a mail box e.g.,"Αυτόματη εξαγωγή οδηγεί από ένα κουτί αλληλογραφίας , π.χ."
 Automatically updated via Stock Entry of type Manufacture/Repack,Αυτόματη ενημέρωση με την είσοδο αποθεμάτων Κατασκευή Τύπος / Repack
 Automotive,Αυτοκίνητο
@@ -511,7 +511,7 @@ Clearance Date,Ημερομηνία Εκκαθάριση
 Clearance Date not mentioned,Εκκαθάριση Ημερομηνία που δεν αναφέρονται
 Clearance date cannot be before check date in row {0},Ημερομηνία εκκαθάρισης δεν μπορεί να είναι πριν από την ημερομηνία άφιξης στη γραμμή {0}
 Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Κάντε κλικ στο «Κάνε Πωλήσεις Τιμολόγιο» για να δημιουργηθεί μια νέα τιμολογίου πώλησης.
-Click on a link to get options to expand get options ,Click on a link to get options to expand get options
+Click on a link to get options to expand get options ,Click on a link to get options to expand get options 
 Client,Πελάτης
 Close Balance Sheet and book Profit or Loss.,Κλείσιμο Ισολογισμού και των Αποτελεσμάτων βιβλίο ή απώλεια .
 Closed,Κλειστό
@@ -841,13 +841,13 @@ Distributor,Διανομέας
 Divorced,Διαζευγμένος
 Do Not Contact,Μην Επικοινωνία
 Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
-Do really want to unstop production order: ,Do really want to unstop production order:
-Do you really want to STOP ,Do you really want to STOP
+Do really want to unstop production order: ,Do really want to unstop production order: 
+Do you really want to STOP ,Do you really want to STOP 
 Do you really want to STOP this Material Request?,Θέλετε πραγματικά να σταματήσει αυτό το υλικό την Αίτηση Συμμετοχής;
 Do you really want to Submit all Salary Slip for month {0} and year {1},Θέλετε πραγματικά να υποβληθούν όλα τα Slip Μισθός για το μήνα {0} και {1 χρόνο }
-Do you really want to UNSTOP ,Do you really want to UNSTOP
+Do you really want to UNSTOP ,Do you really want to UNSTOP 
 Do you really want to UNSTOP this Material Request?,Θέλετε πραγματικά να ξεβουλώνω αυτό Υλικό Αίτηση Συμμετοχής;
-Do you really want to stop production order: ,Do you really want to stop production order:
+Do you really want to stop production order: ,Do you really want to stop production order: 
 Doc Name,Doc Name
 Doc Type,Doc Τύπος
 Document Description,Περιγραφή εγγράφου
@@ -899,7 +899,7 @@ Electronics,ηλεκτρονική
 Email,Email
 Email Digest,Email Digest
 Email Digest Settings,Email Digest Ρυθμίσεις
-Email Digest: ,Email Digest:
+Email Digest: ,Email Digest: 
 Email Id,Id Email
 "Email Id where a job applicant will email e.g. ""jobs@example.com""","Email Id, όπου ένας υποψήφιος θα e-mail π.χ. "jobs@example.com""
 Email Notifications,Ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου
@@ -959,7 +959,7 @@ Enter url parameter for receiver nos,Εισάγετε παράμετρο url γ
 Entertainment & Leisure,Διασκέδαση & Leisure
 Entertainment Expenses,Έξοδα Ψυχαγωγία
 Entries,Καταχωρήσεις
-Entries against ,Entries against
+Entries against ,Entries against 
 Entries are not allowed against this Fiscal Year if the year is closed.,"Οι συμμετοχές δεν επιτρέπεται κατά το τρέχον οικονομικό έτος, εάν το έτος είναι κλειστή."
 Equity,δικαιοσύνη
 Error: {0} > {1},Σφάλμα : {0} > {1}
@@ -1574,7 +1574,7 @@ Maintenance Visit Purpose,Σκοπός Συντήρηση Επίσκεψη
 Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Συντήρηση Επίσκεψη {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 Maintenance start date can not be before delivery date for Serial No {0},Ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης Αύξων αριθμός {0}
 Major/Optional Subjects,Σημαντικές / προαιρετικά μαθήματα
-Make ,Make
+Make ,Make 
 Make Accounting Entry For Every Stock Movement,Κάντε Λογιστική καταχώρηση για κάθε Κίνημα Χρηματιστήριο
 Make Bank Voucher,Κάντε Voucher Bank
 Make Credit Note,Κάντε Πιστωτικό Σημείωμα
@@ -1723,7 +1723,7 @@ Net Weight UOM,Καθαρό Βάρος UOM
 Net Weight of each Item,Καθαρό βάρος κάθε είδους
 Net pay cannot be negative,Καθαρή αμοιβή δεν μπορεί να είναι αρνητική
 Never,Ποτέ
-New ,New
+New ,New 
 New Account,Νέος λογαριασμός
 New Account Name,Νέο Όνομα λογαριασμού
 New BOM,Νέα BOM
@@ -2449,7 +2449,7 @@ Rounded Off,στρογγυλοποιηθεί
 Rounded Total,Στρογγυλεμένες Σύνολο
 Rounded Total (Company Currency),Στρογγυλεμένες Σύνολο (νόμισμα της Εταιρείας)
 Row # ,Row #
-Row # {0}: ,Row # {0}:
+Row # {0}: ,Row # {0}: 
 Row #{0}: Ordered qty can not less than item's minimum order qty (defined in item master).,Σειρά # {0}: Διέταξε ποσότητα δεν μπορεί να μικρότερη από την ελάχιστη ποσότητα σειρά στοιχείου (όπως ορίζεται στο σημείο master).
 Row #{0}: Please specify Serial No for Item {1},Σειρά # {0}: Παρακαλείστε να προσδιορίσετε Αύξων αριθμός για τη θέση {1}
 Row {0}: Account does not match with \						Purchase Invoice Credit To account,Σειρά {0}: Ο λογαριασμός δεν ταιριάζει με \ τιμολογίου αγοράς πίστωση του λογαριασμού
@@ -3317,7 +3317,7 @@ website page link,Ιστοσελίδα link της σελίδας
 {0} must be reduced by {1} or you should increase overflow tolerance,{0} πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξήσει την ανοχή υπερχείλισης
 {0} must have role 'Leave Approver',{0} πρέπει να έχει ρόλο « Αφήστε Έγκρισης »
 {0} valid serial nos for Item {1},{0} έγκυρο σειριακό nos για τη θέση {1}
-{0} {1} against Bill {2} dated {3},{0} {1} εναντίον Bill {2} {3} με ημερομηνία
+{0} {1} against Bill {2} dated {3},{0} {1} εναντίον Bill {2} { 3 με ημερομηνία }
 {0} {1} against Invoice {2},{0} {1} κατά Τιμολόγιο {2}
 {0} {1} has already been submitted,{0} {1} έχει ήδη υποβληθεί
 {0} {1} has been modified. Please refresh.,{0} {1} έχει τροποποιηθεί . Παρακαλώ ανανεώσετε .

erpnext/translations/es.csv

@@ -195,7 +195,7 @@ Allocated amount,cantidad asignada
 Allocated amount can not be negative,Monto asignado no puede ser negativo
 Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 Allow Bill of Materials,Permitir lista de materiales
-Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,"Permitir lista de materiales debe ser ""Sí"". Debido a que una o varias listas de materiales activas presentes para este artículo"
+Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,"Permitir la facturación de Materiales debe ser ""Sí"". Debido a que hay una o varias Solicitudes de Materiales activas presentes para este artículo"
 Allow Children,Permitir hijos
 Allow Dropbox Access,Permitir Acceso a Dropbox
 Allow Google Drive Access,Permitir Acceso a Google Drive
@@ -211,7 +211,7 @@ Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzado
 Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 Allowed Role to Edit Entries Before Frozen Date,Permitir al Rol editar las entradas antes de la Fecha de Cierre
 Amended From,Modificado Desde
-Amount,Cantidad
+Amount,Monto Total
 Amount (Company Currency),Importe (Moneda de la Empresa)
 Amount Paid,Total Pagado
 Amount to Bill,Monto a Facturar
@@ -257,9 +257,9 @@ Approving User cannot be same as user the rule is Applicable To,El usuario que a
 Are you sure you want to STOP ,¿Esta seguro de que quiere DETENER?
 Are you sure you want to UNSTOP ,¿Esta seguro de que quiere CONTINUAR?
 Arrear Amount,Monto Mora
-"As Production Order can be made for this item, it must be a stock item.","Como puede hacerse Orden de Producción  por este concepto , debe ser un elemento con existencias."
+"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 As per Stock UOM,Según Stock UOM
-"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Como hay transacciones de acciones existentes para este artículo , no se pueden cambiar los valores de ""Tiene Númer de Serie ','Artículo en stock"" y "" Método de valoración '"
+"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Como hay transacciones de inventario existentes para este artículo , no se pueden cambiar los valores de ""Tiene Númer de Serie ','Artículo en stock"" y "" Método de valoración '"
 Asset,Activo
 Assistant,Asistente
 Associate,Asociado
@@ -292,27 +292,27 @@ Autoreply when a new mail is received,Respuesta automática cuando se recibe un
 Available,Disponible
 Available Qty at Warehouse,Cantidad Disponible en Almacén
 Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
-"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la lista de materiales , albarán, factura de compra , orden de fabricación , orden de compra , recibo de compra , factura de venta , pedidos de venta , inventario de entrada, parte de horas"
+"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"
 Average Age,Edad Promedio
 Average Commission Rate,Tasa de Comisión Promedio
 Average Discount,Descuento Promedio
 Awesome Products,Productos Increíbles 
 Awesome Services,Servicios Impresionantes 
-BOM Detail No,Número de Detalle en la Lista de Materiales
+BOM Detail No,Número de Detalle en la Solicitud de Materiales
 BOM Explosion Item,BOM Explosion Artículo
-BOM Item,Artículo de la Lista de Materiales
-BOM No,BOM No
-BOM No. for a Finished Good Item,BOM N º de producto terminado artículo
-BOM Operation,BOM Operación
-BOM Operations,Operaciones BOM
-BOM Replace Tool,BOM Replace Tool
-BOM number is required for manufactured Item {0} in row {1},Se requiere el número de lista de materiales para el artículo manufacturado {0} en la fila {1}
-BOM number not allowed for non-manufactured Item {0} in row {1},Número de la lista de materiales no autorizados para la partida no manufacturado {0} en la fila {1}
-BOM recursion: {0} cannot be parent or child of {2},BOM recursividad : {0} no puede ser padre o hijo de {2}
-BOM replaced,BOM reemplazado
-BOM {0} for Item {1} in row {2} is inactive or not submitted,BOM {0} para el artículo {1} en la fila {2} está inactivo o no presentado
-BOM {0} is not active or not submitted,BOM {0} no está activo o no presentado
-BOM {0} is not submitted or inactive BOM for Item {1},BOM {0} no se presenta o inactivo lista de materiales para el elemento {1}
+BOM Item,Artículo de Solicitud de Materiales
+BOM No,Solicitud de Materiales No
+BOM No. for a Finished Good Item,Solicitud de Materiales Nº de Producto Terminado
+BOM Operation,Operación de Solicitud de Materiales
+BOM Operations,Operaciones de Solicitudes de Materiales
+BOM Replace Tool,Herramiento de reemplazo de Solicitud de Materiales
+BOM number is required for manufactured Item {0} in row {1},Se requiere el número de Solicitud de Materiales para el artículo manufacturado {0} en la fila {1}
+BOM number not allowed for non-manufactured Item {0} in row {1},Número de la Solicitud de Materiales no autorizados para la partida no manufacturada {0} en la fila {1}
+BOM recursion: {0} cannot be parent or child of {2},Recursividad de Solicitud de Materiales: {0} no puede ser padre o hijo de {2}
+BOM replaced,Solcitud de Materiales reemplazada
+BOM {0} for Item {1} in row {2} is inactive or not submitted,Solicitud de Materiales {0} para el artículo {1} en la fila {2} está inactivo o no existe
+BOM {0} is not active or not submitted,Solicitud de Materiales {0} no está activo o no existe
+BOM {0} is not submitted or inactive BOM for Item {1},Solicitud de Materiales {0} no se no se encuentra o esta  inactiva para el elemento {1}
 Backup Manager,Administrador de Respaldos
 Backup Right Now,Respaldar Ya
 Backups will be uploaded to,Respaldos serán subidos a
@@ -335,7 +335,7 @@ Bank Overdraft Account,Cuenta Crédito en Cuenta Corriente
 Bank Reconciliation,Conciliación Bancaria
 Bank Reconciliation Detail,Detalle de Conciliación Bancaria
 Bank Reconciliation Statement,Declaración de Conciliación Bancaria
-Bank Voucher,Banco de Vales
+Bank Voucher,Comprobante de Banco
 Bank/Cash Balance,Banco / Balance de Caja
 Banking,Banca
 Barcode,Código de Barras
@@ -347,13 +347,13 @@ Basic Information,Datos Básicos
 Basic Rate,Tasa Básica
 Basic Rate (Company Currency),Tarifa Base ( Divisa de la Compañía )
 Batch,Lote
-Batch (lot) of an Item.,Batch (lote ) de un elemento .
+Batch (lot) of an Item.,Lote de un elemento .
 Batch Finished Date,Fecha de terminacion de lote
 Batch ID,ID de lote
 Batch No,Lote Nro
 Batch Started Date,Fecha de inicio de lote
 Batch Time Logs for billing.,Registros de tiempo de lotes para la facturación .
-Batch-Wise Balance History,Batch- Wise Historial de saldo
+Batch-Wise Balance History,Historial de saldo por lotes
 Batched for Billing,Lotes para facturar
 Better Prospects,Mejores Perspectivas
 Bill Date,Fecha de Factura
@@ -434,14 +434,14 @@ Can be approved by {0},Puede ser aprobado por {0}
 "Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
 "Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función del número de comprobante, si esta agrupado por número de comprobante"
 Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la fila sólo si el tipo de cargo es 'Sobre el importe de la fila anterior""o"" Total de la Fila Anterior"""
-Cancel Material Visit {0} before cancelling this Customer Issue,Cancelar material Visita {0} antes de cancelar esta edición al Cliente
-Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas Materiales {0} antes de cancelar el Mantenimiento Visita
+Cancel Material Visit {0} before cancelling this Customer Issue,Cancelar Visita {0} antes de cancelar esta Solicitud de Cliente
+Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas {0} antes de cancelar la Visita de Mantenimiento
 Cancelled,Cancelado
 Cancelling this Stock Reconciliation will nullify its effect.,Cancelando esta Conciliación de Inventario anulará su efecto.
 Cannot Cancel Opportunity as Quotation Exists,No se puede cancelar Oportunidad mientras existe una Cotización
 Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la aprobación, ya que no está autorizado para aprobar sobre fechas bloqueadas"
 Cannot cancel because Employee {0} is already approved for {1},No se puede cancelar porque Empleado {0} ya está aprobado para {1}
-Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a la entrada Stock presentado {0} existe
+Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que la entrada de almacen {0} existe
 Cannot carry forward {0},No se puede llevar adelante {0}
 Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la Fecha de Inicio del Año Fiscal y la Fecha de Finalización del Año Fiscal una vez que el Año Fiscal se ha guardado.
 "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la empresa, porque existen operaciones existentes. Las transacciones deben ser canceladas para cambiar la moneda por defecto."
@@ -450,7 +450,7 @@ Cannot covert to Group because Master Type or Account Type is selected.,No se pu
 Cannot deactive or cancle BOM as it is linked with other BOMs,No se puede desactivar o cancelar la lista de materiales (BOM) ya que está vinculado con otras listas de materiales
 "Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la Cotización ha sido hecha."
 Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
-"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","No se puede eliminar Nº de Serie {0} en stock . Primero elimine del stock, y a continuación elimine ."
+"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","No se puede eliminar Nº de Serie {0} en inventario . Primero elimine del inventario, y a continuación elimine ."
 "Cannot directly set amount. For 'Actual' charge type, use the rate field","No se puede establecer directamente cantidad . Para el tipo de carga ' real ' , utilice el campo Velocidad"
 "Cannot overbill for Item {0} in row {0} more than {1}. To allow overbilling, please set in Stock Settings","No se puede facturas de mas para el producto {0} en la fila {0} más {1}. Para permitir la facturación excesiva, configure en Ajustes de Inventario"
 Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir más artículo {0} que en la cantidad de pedidos de cliente {1}
@@ -458,7 +458,7 @@ Cannot refer row number greater than or equal to current row number for this Cha
 Cannot return more than {0} for Item {1},No se puede devolver más de {0} para el artículo {1}
 Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe en Fila Anterior' o ' Total en Fila Anterior' dentro de la primera fila
 Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total,"No se puede seleccionar el tipo de carga como 'On Fila Anterior Importe ' o ' En Fila Anterior Total "" para la valoración. Sólo puede seleccionar la opción ""Total"" para la cantidad fila anterior o siguiente de filas total"
-Cannot set as Lost as Sales Order is made.,No se puede definir tan perdido como está hecha de órdenes de venta .
+Cannot set as Lost as Sales Order is made.,No se puede definir como Perdido cuando está hecha la Orden de Venta .
 Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de Descuento para {0}
 Capacity,Capacidad
 Capacity Units,Unidades de Capacidad
@@ -717,7 +717,7 @@ Customize the Notification,Personalice la Notificación
 Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizar el texto de introducción que va como una parte de ese correo electrónico. Cada transacción tiene un texto introductorio separada.
 DN Detail,Detalle DN
 Daily,Diario
-Daily Time Log Summary,Resumen diario Hora de registro
+Daily Time Log Summary,Resumen Diario Hora de Registro
 Database Folder ID,Base de Datos de Identificación de carpetas
 Database of potential customers.,Base de datos de clientes potenciales.
 Date,Fecha
@@ -734,13 +734,13 @@ Date on which lorry started from your warehouse,Fecha en la que comenzó camión
 Dates,Fechas
 Days Since Last Order,Días desde el último pedido
 Days for which Holidays are blocked for this department.,Días para el cual Holidays se bloquean para este departamento .
-Dealer,comerciante
-Debit,débito
+Dealer,Distribuidor
+Debit,Débito
 Debit Amt,débito Amt
 Debit Note,Nota de Débito
 Debit To,débito para
 Debit and Credit not equal for this voucher. Difference is {0}.,Débito y Crédito no es igual para este bono. La diferencia es {0} .
-Deduct,deducir
+Deduct,Deducir
 Deduction,deducción
 Deduction Type,Tipo Deducción
 Deduction1,Deduction1
@@ -748,7 +748,7 @@ Deductions,Deducciones
 Default,defecto
 Default Account,cuenta predeterminada
 Default Address Template cannot be deleted,Plantilla de la dirección predeterminada no puede eliminarse
-Default Amount,Default Amou
+Default Amount,Importe por Defecto
 Default BOM,Por defecto la lista de materiales
 Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Banco de la cuenta / Cash defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
 Default Bank Account,Cuenta bancaria por defecto
@@ -764,17 +764,17 @@ Default Item Group,Grupo predeterminado artículo
 Default Price List,Por defecto Lista de precios
 Default Purchase Account in which cost of the item will be debited.,Cuenta de Compra por defecto en la que se cargará el costo del artículo.
 Default Selling Cost Center,Por defecto Venta de centros de coste
-Default Settings,Configuración predeterminada
+Default Settings,Configuración Predeterminada
 Default Source Warehouse,Origen predeterminado Almacén
 Default Stock UOM,Predeterminado Stock UOM
 Default Supplier,predeterminado Proveedor
-Default Supplier Type,Tipo predeterminado Proveedor
-Default Target Warehouse,Destino predeterminado Almacén
-Default Territory,Territorio predeterminado
-Default Unit of Measure,Unidad de medida predeterminada
+Default Supplier Type,Tipo Predeterminado de Proveedor
+Default Target Warehouse,Almacén de Destino Predeterminado
+Default Territory,Territorio Predeterminado
+Default Unit of Measure,Unidad de Medida Predeterminada
 "Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Unidad de medida predeterminada no se puede cambiar directamente porque ya ha realizado alguna transacción ( s ) con otro UOM . Para cambiar UOM predeterminado, utilice ' UOM reemplazar utilidad ' herramienta de bajo módulo de Stock ."
 Default Valuation Method,Método predeterminado de Valoración
-Default Warehouse,Por defecto Almacén
+Default Warehouse,Almacén por Defecto
 Default Warehouse is mandatory for stock Item.,Por defecto Warehouse es obligatorio para stock.
 Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 Default settings for buying transactions.,Ajustes por defecto para la compra de las transacciones .
@@ -787,7 +787,7 @@ Delete,Eliminar
 Delete {0} {1}?,Eliminar {0} {1} ?
 Delivered,liberado
 Delivered Items To Be Billed,Material que se adjunta a facturar
-Delivered Qty,Entregado Cantidad
+Delivered Qty,Cantidad Entregada
 Delivered Serial No {0} cannot be deleted,Entregado de serie n {0} no se puede eliminar
 Delivery Date,Fecha de Entrega
 Delivery Details,Detalles de la entrega
@@ -805,11 +805,11 @@ Delivery Note {0} must not be submitted,Nota de entrega {0} no debe ser presenta
 Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albaranes {0} debe ser cancelado antes de cancelar esta orden Ventas
 Delivery Status,Estado del Envío
 Delivery Time,Tiempo de Entrega
-Delivery To,Entrega Para
-Department,departamento
+Delivery To,Entregar a
+Department,Departamento
 Department Stores,Tiendas por Departamento
 Depends on LWP,Depende LWP
-Depreciation,depreciación
+Depreciation,Depreciación
 Description,Descripción
 Description HTML,Descripción HTML
 Designation,Puesto
@@ -899,7 +899,7 @@ Electrical,Eléctrico
 Electricity Cost,Coste de electricidad
 Electricity cost per hour,Coste de electricidad por hora
 Electronics,Electrónica
-Email,Email
+Email,Correo Electronico
 Email Digest,boletín por correo electrónico
 Email Digest Settings,Configuración de correo electrónico Digest
 Email Digest: ,Email Digest: 
@@ -1178,16 +1178,16 @@ Group by Voucher,Grupo por Bono
 Group or Ledger,Grupo o Ledger
 Groups,Grupos
 HR Manager,Gerente de Recursos Humanos
-HR Settings,Configuración de recursos humanos
+HR Settings,Configuración de Recursos Humanos
 HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 Half Day,Medio Día
 Half Yearly,Semestral
 Half-yearly,Semestral
 Happy Birthday!,¡Feliz cumpleaños!
 Hardware,Hardware
-Has Batch No,Tiene lotes No
+Has Batch No,Tiene lote No
 Has Child Node,Tiene Nodo Niño
-Has Serial No,Tiene de serie n
+Has Serial No,Tiene No de Serie
 Head of Marketing and Sales,Director de Marketing y Ventas
 Header,Encabezado
 Health Care,Cuidado de la Salud
@@ -1198,18 +1198,18 @@ Help HTML,Ayuda HTML
 "Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Ayuda : Para vincular a otro registro en el sistema , utilice ""# Form / nota / [ Nota Nombre ]"" como la dirección URL Link. (no utilice "" http://"" )"
 "Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 "Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
-Hide Currency Symbol,Ocultar símbolo de moneda
-High,alto
+Hide Currency Symbol,Ocultar Símbolo de Moneda
+High,Alto
 History In Company,Historia In Company
 Hold,mantener
-Holiday,fiesta
-Holiday List,Lista de vacaciones
+Holiday,Feriado
+Holiday List,Lista de Feriados
 Holiday List Name,Lista de nombres de vacaciones
 Holiday master.,Master de vacaciones .
 Holidays,Vacaciones
-Home,Casa
-Host,anfitrión
-"Host, Email and Password required if emails are to be pulled","Host , correo electrónico y la contraseña requerida si los correos electrónicos son para ser tirado"
+Home,Inicio
+Host,Proveedor
+"Host, Email and Password required if emails are to be pulled","Proveedor , Correo Electrónico y la Contraseña son requeridos si los correos electrónicos son para ser importados"
 Hour,Hora
 Hour Rate,Hora de Cambio
 Hour Rate Labour,Hora Cambio del Trabajo
@@ -1224,9 +1224,9 @@ If Monthly Budget Exceeded,Si Presupuesto mensual excedido
 "If Sale BOM is defined, the actual BOM of the Pack is displayed as table. Available in Delivery Note and Sales Order","Si se define la venta BOM , la lista de materiales real del paquete se muestra como mesa. Disponible en la nota de entrega y órdenes de venta"
 "If Supplier Part Number exists for given Item, it gets stored here","Si existe Número de pieza del proveedor relativa a determinado tema , que se almacena aquí"
 If Yearly Budget Exceeded,Si el presupuesto anual ha superado el
-"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si se selecciona, la lista de materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
+"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
 "If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca , no total . de días de trabajo se incluirán los días , y esto reducirá el valor del salario por día"
-"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se marca, el importe del impuesto se considerará como ya incluido en el Monto Imprimir Vota / Imprimir"
+"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"
 If different than customer address,Si es diferente a la dirección del cliente
 "If disable, 'Rounded Total' field will not be visible in any transaction","Si desactiva , el campo "" Total redondeado ' no será visible en cualquier transacción"
 "If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
@@ -1708,15 +1708,15 @@ Must be Whole Number,Debe ser un número entero
 Name,Nombre
 Name and Description,Nombre y descripción
 Name and Employee ID,Nombre y ID de empleado
-"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Nombre de la nueva cuenta . Nota : Por favor no crear cuentas para clientes y proveedores , se crean automáticamente desde el cliente y el proveedor principal"
-Name of person or organization that this address belongs to.,Nombre de la persona u organización que esta dirección pertenece.
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Nombre de la Nueva Cuenta . Nota : Por favor no crear cuentas para Clientes y Proveedores , se crean automáticamente desde el maestro de Clientes y Proveedores."
+Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
 Name of the Budget Distribution,Nombre de la Distribución del Presupuesto
 Naming Series,Nombrar Series
 Negative Quantity is not allowed,Cantidad negativa no se permite
 Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Stock Error ( {6} ) para el punto {0} en Almacén {1} en {2} {3} en {4} {5}
 Negative Valuation Rate is not allowed,Negativo valoración de tipo no está permitida
 Negative balance in Batch {0} for Item {1} at Warehouse {2} on {3} {4},Saldo negativo en lotes {0} para el artículo {1} en Almacén {2} del {3} {4}
-Net Pay,Pago neto
+Net Pay,Pago Neto
 Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina .
 Net Profit / Loss,Utilidad Neta / Pérdida
 Net Total,total Neto
@@ -1725,25 +1725,25 @@ Net Weight,Peso neto
 Net Weight UOM,Peso neto UOM
 Net Weight of each Item,Peso neto de cada artículo
 Net pay cannot be negative,Salario neto no puede ser negativo
-Never,nunca
-New ,New 
-New Account,Nueva cuenta
+Never,Nunca
+New ,Nuevo
+New Account,Nueva Cuenta
 New Account Name,Nueva Cuenta Nombre
-New BOM,Nueva lista de materiales
-New Communications,nuevas comunicaciones
+New BOM,Nueva Solicitud de Materiales
+New Communications,Nuevas Comunicaciones
 New Company,Nueva Empresa
 New Cost Center,Nuevo Centro de Costo
-New Cost Center Name,Nuevo nombre de centros de coste
-New Delivery Notes,Nuevas notas de entrega
-New Enquiries,Nuevas consultas
-New Leads,nuevas pistas
+New Cost Center Name,Nombre de Nuevo Centro de Coste
+New Delivery Notes,Nuevas Notas de Entrega
+New Enquiries,Nuevas Consultas
+New Leads,Nuevas Oportunidades
 New Leave Application,Nueva aplicación Dejar
 New Leaves Allocated,Nuevas Hojas asignados
 New Leaves Allocated (In Days),Nuevas Hojas Asignados ( en días)
 New Material Requests,Las nuevas solicitudes de material
 New Projects,Nuevos Proyectos
 New Purchase Orders,Las nuevas órdenes de compra
-New Purchase Receipts,Nuevos recibos de compra
+New Purchase Receipts,Nuevos Recibos de Compra
 New Quotations,Nuevas Citas
 New Sales Orders,Las nuevas órdenes de venta
 New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nueva serie n no puede tener Warehouse. Depósito debe ser ajustado por Stock Entrada o recibo de compra
@@ -2209,46 +2209,46 @@ Published on website at: {0},Publicado en el sitio web en: {0}
 Publishing,Publicación
 Pull sales orders (pending to deliver) based on the above criteria,Tire de las órdenes de venta (pendiente de entregar ) sobre la base de los criterios anteriores
 Purchase,Compra
-Purchase / Manufacture Details,Detalles de compra / Fábricas
+Purchase / Manufacture Details,Detalles de Compra / Fábricas
 Purchase Analytics,Analitico de Compras
 Purchase Common,Compra Común
 Purchase Details,Detalles de Compra
 Purchase Discounts,Descuentos sobre Compra
 Purchase Invoice,Factura de Compra
 Purchase Invoice Advance,Compra Factura Anticipada
-Purchase Invoice Advances,Avances Compra Factura
-Purchase Invoice Item,Factura de compra del artículo
-Purchase Invoice Trends,Compra Tendencias Factura
-Purchase Invoice {0} is already submitted,Compra Factura {0} ya está presentado
+Purchase Invoice Advances,Adelantos a Factura de Compra
+Purchase Invoice Item,Factura de Compra del artículo
+Purchase Invoice Trends,Tendencias de Facturas de Compra
+Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 Purchase Order,Orden de Compra
-Purchase Order Item,Orden de compra de artículos
-Purchase Order Item No,Orden de compra del artículo
-Purchase Order Item Supplied,Orden de compra del artículo suministrado
-Purchase Order Items,Compra Items
-Purchase Order Items Supplied,Compra Items suministrados
-Purchase Order Items To Be Billed,Artículos de orden de compra a facturar
-Purchase Order Items To Be Received,Los productos que compra para poder ser recibidas
-Purchase Order Message,Orden de Compra Mensaje
+Purchase Order Item,Articulos de la Orden de Compra
+Purchase Order Item No,Orden de Compra del Artículo No
+Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
+Purchase Order Items,Orden de Compra de Productos
+Purchase Order Items Supplied,Orden de Compra Productos Suministrados
+Purchase Order Items To Be Billed,Artículos de Orden de Compra a Facturar
+Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
+Purchase Order Message,Mensaje de la Orden de Compra
 Purchase Order Required,Orden de Compra Requerido
-Purchase Order Trends,Compra Tendencias Solicitar
-Purchase Order number required for Item {0},Número de orden de compra se requiere para el elemento {0}
+Purchase Order Trends,Tendencias de Ordenes de Compra
+Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 Purchase Order {0} is 'Stopped',Orden de Compra {0} ' Detenido '
-Purchase Order {0} is not submitted,Orden de Compra {0} no se presenta
-Purchase Orders given to Suppliers.,Órdenes de Compra otorgados a Proveedores .
+Purchase Order {0} is not submitted,Orden de Compra {0} no existe
+Purchase Orders given to Suppliers.,Órdenes de Compra asignadas a Proveedores .
 Purchase Receipt,Recibo de Compra
-Purchase Receipt Item,Recibo de compra del artículo
-Purchase Receipt Item Supplied,Recibo de compra del artículo suministrado
-Purchase Receipt Item Supplieds,Compra de recibos Supplieds artículo
-Purchase Receipt Items,Compra de recibos Artículos
-Purchase Receipt Message,Recibo de compra mensaje
-Purchase Receipt No,Recibo de compra No
-Purchase Receipt Required,Recibo de compra requerida
-Purchase Receipt Trends,Tendencias de Compra de recibos
-Purchase Receipt number required for Item {0},Número de recibo de compra requerida para el punto {0}
-Purchase Receipt {0} is not submitted,Recibo de compra {0} no se presenta
-Purchase Register,Compra Registrarse
-Purchase Return,Compra retorno
-Purchase Returned,compra vuelta
+Purchase Receipt Item,Recibo de Compra del Artículo
+Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
+Purchase Receipt Item Supplieds,Recibo de Compra Artículo Adquiridos
+Purchase Receipt Items,Artículos de Recibo de Compra
+Purchase Receipt Message,Mensaje de Recibo de Compra
+Purchase Receipt No,Recibo de Compra No
+Purchase Receipt Required,Recibo de Compra Requerido
+Purchase Receipt Trends,Tendencias de Recibos de Compra
+Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
+Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+Purchase Register,Registrar Compra
+Purchase Return,Devolucion de Compra
+Purchase Returned,Compra Devuelta
 Purchase Taxes and Charges,Impuestos de Compra y Cargos
 Purchase Taxes and Charges Master,Impuestos de Compra y Cargos Maestro
 Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
@@ -2404,7 +2404,7 @@ Reqd By Date,Reqd Por Fecha
 Reqd by Date,Reqd Fecha
 Request Type,Tipo de solicitud
 Request for Information,Solicitud de Información
-Request for purchase.,Solicitar a la venta.
+Request for purchase.,Solicitud de compra.
 Requested,Requerido
 Requested For,Solicitados para
 Requested Items To Be Ordered,Artículos solicitados será condenada
@@ -2484,7 +2484,7 @@ SO Date,SO Fecha
 SO Pending Qty,SO Pendiente Cantidad
 SO Qty,SO Cantidad
 Salary,Salario
-Salary Information,La información sobre sueldos
+Salary Information,Información salarial
 Salary Manager,Administrador de Salario
 Salary Mode,Modo Salario
 Salary Slip,Slip Salario
@@ -2803,7 +2803,7 @@ Submit this Production Order for further processing.,Enviar esta Orden de Produc
 Submitted,Enviado
 Subsidiary,Filial
 Successful: ,Con éxito:
-Successfully Reconciled,Con éxito Reconciled
+Successfully Reconciled,Reconciliado con éxito
 Suggestions,Sugerencias
 Sunday,Domingo
 Supplier,Proveedor
@@ -2812,7 +2812,7 @@ Supplier (vendor) name as entered in supplier master,Proveedor (vendedor ) nombr
 Supplier > Supplier Type,Proveedor> Tipo de Proveedor
 Supplier Account Head,Cuenta Proveedor Head
 Supplier Address,Dirección del proveedor
-Supplier Addresses and Contacts,Direcciones del surtidor y Contactos
+Supplier Addresses and Contacts,Contactos y Direcciones del Proveedor
 Supplier Details,Detalles del Proveedor
 Supplier Intro,Proveedor Intro
 Supplier Invoice Date,Proveedor Fecha de la factura
@@ -3080,28 +3080,28 @@ Under Graduate,Bajo de Postgrado
 Under Warranty,Bajo Garantía
 Unit,Unidad
 Unit of Measure,Unidad de Medida
-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 el factor de conversión de la tabla
-"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unidad de medida de este material ( por ejemplo, Kg , Unidad , No, par) ."
+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 el factor de conversión de la tabla
+"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unidad de Medida de este material ( por ejemplo, Kg , Unidad , No, Par) ."
 Units/Hour,Unidades/Hora
 Units/Shifts,Unidades /Turnos
 Unpaid,No Pagado
-Unreconciled Payment Details,No reconciliadas Detalles de pago
-Unscheduled,no programada
+Unreconciled Payment Details,Detalles de Pago No Conciliadas 
+Unscheduled,No Programada
 Unsecured Loans,Préstamos sin garantía
-Unstop,desatascar
-Unstop Material Request,Solicitud Unstop material
-Unstop Purchase Order,Unstop Orden de Compra
-Unsubscribed,no suscribirse
+Unstop,Continuar
+Unstop Material Request,Continuar Solicitud de Material
+Unstop Purchase Order,Continuar Orden de Compra
+Unsubscribed,No Suscrito
 Update,Actualización
-Update Clearance Date,Fecha de actualización Liquidación
+Update Clearance Date,Actulizar Fecha de Liquidación
 Update Cost,actualización de Costos
 Update Finished Goods,Actualización de las mercancías acabadas
 Update Landed Cost,Actualice el costo de aterrizaje
 Update Series,Series Update
 Update Series Number,Actualización de los números de serie
 Update Stock,Actualización de Stock
-Update bank payment dates with journals.,Actualización de las fechas de pago del banco con las revistas .
-Update clearance date of Journal Entries marked as 'Bank Vouchers',Fecha de despacho de actualización de entradas de diario marcado como ' Banco vales '
+Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
+Update clearance date of Journal Entries marked as 'Bank Vouchers',Fecha de Actualización de Comprobantes de Diario marcados como ' Comprobantes de Bancos '
 Updated,actualizado
 Updated Birthday Reminders,Actualizado Birthday Reminders
 Upload Attendance,Subir Asistencia
@@ -3136,49 +3136,49 @@ Utilities,Utilidades
 Utility Expenses,Los gastos de servicios públicos
 Valid For Territories,Válido para los territorios
 Valid From,Válido desde
-Valid Upto,Válido Hasta
+Valid Upto,Válido hasta
 Valid for Territories,Válido para los territorios
-Validate,validar
-Valuation,valuación
+Validate,Validar
+Valuation,Valuación
 Valuation Method,Método de Valoración
-Valuation Rate,Valoración de Cambio
-Valuation Rate required for Item {0},Valoración de tipo requerido para el punto {0}
-Valuation and Total,Tasación y Total
-Value,valor
+Valuation Rate,Tasa de Valoración
+Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
+Valuation and Total,Valuación y Total
+Value,Valor
 Value or Qty,Valor o Cant.
-Vehicle Dispatch Date,Despacho de vehículo Fecha
-Vehicle No,Vehículo No hay
-Venture Capital,capital de Riesgo
-Verified By,Verified By
-View Ledger,Ver Ledger
-View Now,ver Ahora
-Visit report for maintenance call.,Visita informe de llamada de mantenimiento .
-Voucher #,Bono #
-Voucher Detail No,Detalle hoja no
-Voucher Detail Number,Vale Número Detalle
-Voucher ID,vale ID
-Voucher No,vale No
-Voucher Type,Tipo de Vales
-Voucher Type and Date,Tipo Bono y Fecha
+Vehicle Dispatch Date,Fecha de despacho de vehículo
+Vehicle No,Vehículo No
+Venture Capital,Capital de Riesgo
+Verified By,Verificado por
+View Ledger,Ver Libro Mayor
+View Now,Ver Ahora
+Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
+Voucher #,Comprobante #
+Voucher Detail No,Detalle de Comprobante No
+Voucher Detail Number,Número de Detalle de Comprobante
+Voucher ID,Comprobante ID
+Voucher No,Comprobante No
+Voucher Type,Tipo de Comprobante
+Voucher Type and Date,Tipo de Comprobante y Fecha
 Walk In,Entrar
 Warehouse,Almacén
 Warehouse Contact Info,Información de Contacto del Almacén 
 Warehouse Detail,Detalle de almacenes
 Warehouse Name,Nombre del Almacén
 Warehouse and Reference,Almacén y Referencia
-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 acciones para este almacén.
+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.
 Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
-Warehouse is mandatory for stock Item {0} in row {1},Warehouse es obligatoria para la acción del artículo {0} en la fila {1}
+Warehouse is mandatory for stock Item {0} in row {1},Almacén es obligatorio para la acción del artículo {0} en la fila {1}
 Warehouse is missing in Purchase Order,Almacén falta en la Orden de Compra
 Warehouse not found in the system,Almacén no se encuentra en el sistema
-Warehouse required for stock Item {0},Depósito requerido para la acción del artículo {0}
+Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
 Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
 Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
 Warehouse {0} does not exist,Almacén {0} no existe
-Warehouse {0}: Company is mandatory,Almacén {0}: Company es obligatoria
-Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: cuenta Parent {1} no bolong a la empresa {2}
+Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
+Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
 Warehouse-Wise Stock Balance,Warehouse- Wise Stock Equilibrio
 Warehouse-wise Item Reorder,- Almacén sabio artículo reorden
 Warehouses,Almacenes
@@ -3233,14 +3233,14 @@ Working,laboral
 Working Days,Días de trabajo
 Workstation,puesto de trabajo
 Workstation Name,Estación de trabajo Nombre
-Write Off Account,Escribe Off Cuenta
-Write Off Amount,Escribe Off Monto
+Write Off Account,Solicitar Cuenta
+Write Off Amount,Solicitar Monto
 Write Off Amount <=,Escribe Off Importe < =
-Write Off Based On,Escribe apagado basado en
-Write Off Cost Center,Escribe Off Center Costo
-Write Off Outstanding Amount,Escribe Off Monto Pendiente
-Write Off Voucher,Escribe Off Voucher
-Wrong Template: Unable to find head row.,Plantilla incorrecto : no se puede encontrar la fila cabeza.
+Write Off Based On,Solicitar basado en
+Write Off Cost Center,Solicitar Centro de Costo
+Write Off Outstanding Amount,Solicitar Monto Pendiente
+Write Off Voucher,Solicitar Comprobante
+Wrong Template: Unable to find head row.,Plantilla incorrecta : No se puede encontrar el encabezado.
 Year,Año
 Year Closed,Año Cerrado
 Year End Date,Año de Finalización
@@ -3251,19 +3251,19 @@ Yearly,Anual
 Yes,Sí
 You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
-You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el aprobador de gastos para este registro. Actualice el 'Estado' y Guarde
-You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el aprobador de dejar para este registro. Actualice el 'Estado' y Guarde
+You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
+You are the Leave Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de las Vacaciones relacionadas a este registro. Actualice el 'Estado' y Guarde
 You can enter any date manually,Puede introducir cualquier fecha manualmente
 You can enter the minimum quantity of this item to be ordered.,Puede introducir la cantidad mínima que se puede pedir de este artículo.
-You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si BOM es mencionado contra cualquier artículo
-You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,No se puede introducir tanto Entrega Nota No. y Factura No. Por favor ingrese cualquiera .
-You can not enter current voucher in 'Against Journal Voucher' column,Usted no puede introducir el bono actual en la columna 'Contra Vale Diario'
-You can set Default Bank Account in Company master,Puede configurar cuenta bancaria por defecto en el maestro de la empresa
+You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
+You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,"No se puede introducir tanto ""No de Nota de Emtrega""  y ""No de Factura"". Por favor ingrese cualquiera ."
+You can not enter current voucher in 'Against Journal Voucher' column,Usted no puede introducir el comprobante actual en la columna 'Contra Vale Diario'
+You can set Default Bank Account in Company master,Puede configurar Cuenta Bancaria por defecto en el maestro de la empresa
 You can start by selecting backup frequency and granting access for sync,Puede empezar por seleccionar la frecuencia de copia de seguridad y conceder acceso para sincronizar
-You can submit this Stock Reconciliation.,Puede enviar este Stock Reconciliación.
+You can submit this Stock Reconciliation.,Puede enviar esta Conciliación de Inventario.
 You can update either Quantity or Valuation Rate or both.,"Puede actualizar la Cantidad, el Valor, o ambos."
-You cannot credit and debit same account at the same time,No se puede anotar en el crédito y débito de una cuenta al mismo tiempo
-You have entered duplicate items. Please rectify and try again.,Ha introducido los elementos duplicados . Por favor rectifique y vuelva a intentarlo .
+You cannot credit and debit same account at the same time,No se puede registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
 You may need to update: {0},Puede que tenga que actualizar : {0}
 You must Save the form before proceeding,Debe guardar el formulario antes de proceder
 Your Customer's TAX registration numbers (if applicable) or any general information,Los números de registro de impuestos de su cliente ( si es aplicable) o cualquier información de carácter general
@@ -3285,7 +3285,7 @@ and,y
 are not allowed.,no están permitidos.
 assigned by,asignado por
 cannot be greater than 100,No puede ser mayor que 100
-"e.g. ""Build tools for builders""","por ejemplo "" Construir herramientas para los constructores """
+"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 "e.g. ""MC""","por ejemplo ""MC """
 "e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
 e.g. 5,por ejemplo 5
@@ -3322,7 +3322,7 @@ website page link,el vínculo web
 {0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 {0} must have role 'Leave Approver',{0} debe tener rol ' Dejar aprobador '
 {0} valid serial nos for Item {1},{0} nn serie válidos para el elemento {1}
-{0} {1} against Bill {2} dated {3},{0} {1} {2} contra Bill {3} de fecha
+{0} {1} against Bill {2} dated {3},{0} {1} { 2 contra Bill } {3} de fecha
 {0} {1} against Invoice {2},{0} {1} contra Factura {2}
 {0} {1} has already been submitted,{0} {1} ya ha sido presentado
 {0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor regenere .

erpnext/translations/fr.csv

@@ -1043,7 +1043,7 @@ Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une m
 Financial Analytics,Financial Analytics
 Financial Services,services financiers
 Financial Year End Date,Date de fin de l'exercice financier
-Financial Year Start Date,Les paramètres par défaut pour la vente de transactions .
+Financial Year Start Date,Date de Début de l'exercice financier
 Finished Goods,Produits finis
 First Name,Prénom
 First Responded On,D'abord répondu le
@@ -2589,7 +2589,7 @@ Select Sales Orders from which you want to create Production Orders.,Sélectionn
 Select Time Logs and Submit to create a new Sales Invoice.,Sélectionnez registres de temps et de soumettre à créer une nouvelle facture de vente.
 Select Transaction,Sélectionnez Transaction
 Select Warehouse...,Sélectionnez Entrepôt ...
-Select Your Language,« Jours depuis la dernière commande» doit être supérieur ou égal à zéro
+Select Your Language,Sélectionnez votre langue
 Select account head of the bank where cheque was deposited.,Sélectionnez tête compte de la banque où chèque a été déposé.
 Select company name first.,Sélectionnez le nom de la première entreprise.
 Select template from which you want to get the Goals,Sélectionnez le modèle à partir duquel vous souhaitez obtenir des Objectifs
@@ -2669,7 +2669,7 @@ Settings for HR Module,Utilisateur {0} est désactivé
 "Settings to extract Job Applicants from a mailbox e.g. ""jobs@example.com""",Paramètres pour extraire demandeurs d'emploi à partir d'une boîte aux lettres par exemple "jobs@example.com"
 Setup,Configuration
 Setup Already Complete!!,Configuration déjà complet !
-Setup Complete,installation terminée
+Setup Complete,Installation terminée
 Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
 Setup Series,Série de configuration
 Setup Wizard,actif à court terme
@@ -2703,7 +2703,7 @@ Signature,Signature
 Signature to be appended at the end of every email,Signature d'être ajouté à la fin de chaque e-mail
 Single,Unique
 Single unit of an Item.,Une seule unité d'un élément.
-Sit tight while your system is being setup. This may take a few moments.,Asseyez-vous serré alors que votre système est en cours d' installation. Cela peut prendre quelques instants .
+Sit tight while your system is being setup. This may take a few moments.,Veuillez patienter pendant l’installation. L’opération peut prendre quelques minutes. 
 Slideshow,Diaporama
 Soap & Detergent,Savons et de Détergents
 Software,logiciel
@@ -2919,7 +2919,7 @@ The date on which recurring invoice will be stop,La date à laquelle la facture
 "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ","Le jour du mois au cours duquel la facture automatique sera généré, par exemple 05, 28, etc"
 The day(s) on which you are applying for leave are holiday. You need not apply for leave.,S'il vous plaît entrer comptes débiteurs groupe / à payer en master de l'entreprise
 The first Leave Approver in the list will be set as the default Leave Approver,Le premier congé approbateur dans la liste sera définie comme le congé approbateur de défaut
-The first user will become the System Manager (you can change that later).,Le premier utilisateur deviendra le gestionnaire du système ( vous pouvez changer cela plus tard ) .
+The first user will become the System Manager (you can change that later).,Le premier utilisateur deviendra le gestionnaire du système (vous pouvez changer cela plus tard).
 The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d'emballage. (Pour l'impression)
 The name of your company for which you are setting up this system.,Le nom de votre entreprise pour laquelle vous configurez ce système .
 The net weight of this package. (calculated automatically as sum of net weight of items),Le poids net de ce paquet. (Calculé automatiquement comme la somme du poids net des articles)
@@ -2971,7 +2971,7 @@ To Date,À ce jour
 To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
 To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0}
 To Discuss,Pour discuter
-To Do List,To Do List
+To Do List,Liste de choses à faire
 To Package No.,Pour Emballer n °
 To Produce,pour Produire
 To Time,To Time
@@ -3206,7 +3206,7 @@ Weightage,Weightage
 Weightage (%),Weightage (%)
 Welcome,Bienvenue
 Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Bienvenue à ERPNext . Au cours des prochaines minutes, nous allons vous aider à configurer votre compte ERPNext . Essayez de remplir autant d'informations que vous avez même si cela prend un peu plus longtemps . Elle vous fera économiser beaucoup de temps plus tard . Bonne chance !"
-Welcome to ERPNext. Please select your language to begin the Setup Wizard.,Tête de compte {0} créé
+Welcome to ERPNext. Please select your language to begin the Setup Wizard.,Bienvenue sur ERPNext selecionnez votr langue pour démarrer l'assistant de configuration.
 What does it do?,Que faut-il faire ?
 "When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Lorsque l'une des opérations contrôlées sont «soumis», un e-mail pop-up s'ouvre automatiquement pour envoyer un courrier électronique à l'associé "Contact" dans cette transaction, la transaction en pièce jointe. L'utilisateur peut ou ne peut pas envoyer l'e-mail."
 "When submitted, the system creates difference entries to set the given stock and valuation on this date.","Lorsqu'il est utilisé, le système crée des entrées de différence pour définir le stock et l'évaluation donnée à cette date ."
@@ -3268,8 +3268,8 @@ Your Login Id,Votre ID de connexion
 Your Products or Services,Vos produits ou services
 Your Suppliers,vos fournisseurs
 Your email address,Frais indirects
-Your financial year begins on,"Vous ne pouvez pas changer la devise par défaut de l'entreprise , car il ya des opérations existantes . Les opérations doivent être annulées pour changer la devise par défaut ."
-Your financial year ends on,Votre exercice se termine le
+Your financial year begins on,Date de début de la période comptable
+Your financial year ends on,Date de fin de la période comptable
 Your sales person who will contact the customer in future,Votre personne de ventes qui prendra contact avec le client dans le futur
 Your sales person will get a reminder on this date to contact the customer,Votre personne de ventes recevoir un rappel de cette date pour contacter le client
 Your setup is complete. Refreshing...,Votre installation est terminée. Rafraîchissant ...
@@ -3318,7 +3318,7 @@ website page link,Lien vers page web
 {0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
 {0} must have role 'Leave Approver',Nouveau Stock UDM est nécessaire
 {0} valid serial nos for Item {1},BOM {0} pour objet {1} à la ligne {2} est inactif ou non soumis
-{0} {1} against Bill {2} dated {3},{0} {1} contre le projet de loi en date du {2} {3}
+{0} {1} against Bill {2} dated {3},S'il vous plaît entrer le titre !
 {0} {1} against Invoice {2},investissements
 {0} {1} has already been submitted,"S'il vous plaît entrer » est sous-traitée "" comme Oui ou Non"
 {0} {1} has been modified. Please refresh.,Point ou Entrepôt à la ligne {0} ne correspond pas à la Demande de Matériel

erpnext/translations/id.csv

@@ -42,7 +42,7 @@ A Supplier exists with same name,Pemasok dengan nama yang sama sudah ada
 A symbol for this currency. For e.g. $,Simbol untuk mata uang ini. Contoh $
 AMC Expiry Date,AMC Tanggal Berakhir
 Abbr,Singkatan
-Abbreviation cannot have more than 5 characters,Singkatan tak bisa memiliki lebih dari 5 karakter
+Abbreviation cannot have more than 5 characters,Singkatan tidak dapat melebihi 5 karakter
 Above Value,Nilai di atas
 Absent,Absen
 Acceptance Criteria,Kriteria Penerimaan
@@ -86,7 +86,7 @@ Accounting,Akuntansi
 "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
 Accounting journal entries.,Pencatatan Jurnal akuntansi.
 Accounts,Akun / Rekening
-Accounts Browser,Account Browser
+Accounts Browser,Pencarian Akun
 Accounts Frozen Upto,Akun dibekukan sampai dengan
 Accounts Payable,Hutang
 Accounts Receivable,Piutang
@@ -130,7 +130,7 @@ Address HTML,Alamat HTML
 Address Line 1,Alamat Baris 1
 Address Line 2,Alamat Baris 2
 Address Template,Template Alamat
-Address Title,Alamat Judul
+Address Title,Judul Alamat
 Address Title is mandatory.,"Wajib masukan Judul Alamat.
 "
 Address Type,Tipe Alamat
@@ -141,7 +141,7 @@ Advance Amount,Jumlah Uang Muka
 Advance amount,Jumlah muka
 Advances,Uang Muka
 Advertisement,iklan
-Advertising,Pengiklanan
+Advertising,Periklanan
 Aerospace,Aerospace
 After Sale Installations,Pemasangan setelah Penjualan
 Against,Terhadap
@@ -150,8 +150,7 @@ Against Bill {0} dated {1},Terhadap Bill {0} tanggal {1}
 Against Docname,Terhadap Docname
 Against Doctype,Terhadap Doctype
 Against Document Detail No,Terhadap Detail Dokumen No.
-Against Document No,"Melawan Dokumen No.
-"
+Against Document No,Terhadap Dokumen No.
 Against Expense Account,Terhadap Akun Biaya
 Against Income Account,Terhadap Akun Pendapatan
 Against Journal Voucher,Terhadap Voucher Journal
@@ -175,12 +174,12 @@ All Contacts.,Semua Kontak.
 All Customer Contact,Semua Kontak Pelanggan
 All Customer Groups,Semua Grup Pelanggan
 All Day,Semua Hari
-All Employee (Active),Semua Karyawan (Active)
+All Employee (Active),Semua Karyawan (Aktif)
 All Item Groups,Semua Grup Barang/Item
 All Lead (Open),Semua Prospektus (Open)
 All Products or Services.,Semua Produk atau Jasa.
 All Sales Partner Contact,Kontak Semua Partner Penjualan
-All Sales Person,Semua Salesperson
+All Sales Person,Semua Salesmen
 All Supplier Contact,Kontak semua pemasok
 All Supplier Types,Semua Jenis pemasok
 All Territories,Semua Wilayah
@@ -190,7 +189,7 @@ All items have already been invoiced,Semua Barang telah tertagih
 All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
 Allocate,Alokasi
 Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
-Allocate leaves for the year.,Alokasi cuti untuk tahun ini.
+Allocate leaves for the year.,Alokasi cuti untuk tahunan.
 Allocated Amount,Jumlah alokasi
 Allocated Budget,Alokasi Anggaran
 Allocated amount,Jumlah yang dialokasikan
@@ -199,8 +198,8 @@ Allocated amount can not greater than unadusted amount,Jumlah yang dialokasikan
 Allow Bill of Materials,Izinkan untuk Bill of Material
 Allow Bill of Materials should be 'Yes'. Because one or many active BOMs present for this item,Izinkan untuk Bill of Material harus 'Ya'. karena ada satu atau lebih BOM aktif untuk item barang ini.
 Allow Children,Izinkan Anak Akun
-Allow Dropbox Access,Izinkan Dropbox Access
-Allow Google Drive Access,Izinkan Google Drive Access
+Allow Dropbox Access,Izinkan Akses Dropbox
+Allow Google Drive Access,Izinkan Akses Google Drive
 Allow Negative Balance,Izinkan Saldo Negatif
 Allow Negative Stock,Izinkan Bursa Negatif
 Allow Production Order,Izinkan Pesanan Produksi
@@ -228,7 +227,7 @@ Another Salary Structure {0} is active for employee {0}. Please make its status
 Apparel & Accessories,Pakaian & Aksesoris
 Applicability,Penerapan
 Applicable For,Berlaku Untuk
-Applicable Holiday List,Berlaku Libur
+Applicable Holiday List,Daftar hari libur yang berlaku
 Applicable Territory,Wilayah yang berlaku
 Applicable To (Designation),Berlaku Untuk (Penunjukan)
 Applicable To (Employee),Berlaku Untuk (Karyawan)
@@ -239,14 +238,14 @@ Applicant for a Job.,Pemohon untuk pekerjaan.
 Application of Funds (Assets),Penerapan Dana (Aset)
 Applications for leave.,Aplikasi untuk cuti.
 Applies to Company,Berlaku untuk Perusahaan
-Apply On,Terapkan On
+Apply On,Terapkan Pada
 Appraisal,Penilaian
-Appraisal Goal,Penilaian Goal
-Appraisal Goals,Penilaian Gol
-Appraisal Template,Appraisal Template
-Appraisal Template Goal,Gol Appraisal Template
-Appraisal Template Title,Appraisal Template Judul
-Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} diciptakan untuk Employee {1} dalam rentang tanggal tertentu
+Appraisal Goal,Penilaian Pencapaian
+Appraisal Goals,Penilaian Pencapaian
+Appraisal Template,Template Penilaian
+Appraisal Template Goal,Template Penilaian Pencapaian
+Appraisal Template Title,Judul Template Penilaian
+Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
 Apprentice,Magang
 Approval Status,Status Persetujuan
 Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
@@ -256,8 +255,8 @@ Approving Role,Menyetujui Peran
 Approving Role cannot be same as role the rule is Applicable To,Menyetujui Peran tidak bisa sama dengan peran aturan yang Berlaku Untuk
 Approving User,Menyetujui Pengguna
 Approving User cannot be same as user the rule is Applicable To,Menyetujui Pengguna tidak bisa sama dengan pengguna aturan yang Berlaku Untuk
-Are you sure you want to STOP ,Are you sure you want to STOP 
-Are you sure you want to UNSTOP ,Are you sure you want to UNSTOP 
+Are you sure you want to STOP ,Apakah anda yakin untuk berhenti
+Are you sure you want to UNSTOP ,Apakah anda yakin untuk batal berhenti
 Arrear Amount,Jumlah tunggakan
 "As Production Order can be made for this item, it must be a stock item.","Seperti Orde Produksi dapat dibuat untuk item ini, itu harus menjadi barang saham."
 As per Stock UOM,Per Saham UOM
@@ -265,41 +264,41 @@ As per Stock UOM,Per Saham UOM
 Asset,Aset
 Assistant,Asisten
 Associate,Rekan
-Atleast one of the Selling or Buying must be selected,Atleast salah satu Jual atau Beli harus dipilih
-Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
+Atleast one of the Selling or Buying must be selected,"Setidaknya salah satu, Jual atau Beli harus dipilih"
+Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
 Attach Image,Pasang Gambar
 Attach Letterhead,Lampirkan Surat
 Attach Logo,Pasang Logo
 Attach Your Picture,Pasang Gambar Anda
 Attendance,Kehadiran
-Attendance Date,Kehadiran Tanggal
+Attendance Date,Tanggal Kehadiran
 Attendance Details,Rincian Kehadiran
 Attendance From Date,Kehadiran Dari Tanggal
-Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran To Date adalah wajib
-Attendance To Date,Kehadiran To Date
+Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran Sampai Tanggal adalah wajib
+Attendance To Date,Kehadiran Sampai Tanggal
 Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
 Attendance record.,Catatan kehadiran.
 Authorization Control,Pengendalian Otorisasi
-Authorization Rule,Aturan Otorisasi
-Auto Accounting For Stock Settings,Auto Akuntansi Untuk Stock Pengaturan
-Auto Material Request,Auto Material Permintaan
-Auto-raise Material Request if quantity goes below re-order level in a warehouse,Auto-meningkatkan Permintaan Material jika kuantitas berjalan di bawah tingkat re-order di gudang
+Authorization Rule,Regulasi Autorisasi
+Auto Accounting For Stock Settings,Akuntansi Otomatis Untuk Stock Pengaturan
+Auto Material Request,Permintaan Material Otomatis
+Auto-raise Material Request if quantity goes below re-order level in a warehouse,Naikan secara otomatis Permintaan Material jika kuantitas berjalan di bawah tingkat pemesanan ulang di gudang
 Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
 Automatically extract Job Applicants from a mail box ,Automatically extract Job Applicants from a mail box 
 Automatically extract Leads from a mail box e.g.,Secara otomatis mengekstrak Memimpin dari kotak surat misalnya
 Automatically updated via Stock Entry of type Manufacture/Repack,Secara otomatis diperbarui melalui Bursa Masuknya jenis Industri / Repack
-Automotive,Ot
-Autoreply when a new mail is received,Autoreply ketika mail baru diterima
+Automotive,Otomotif
+Autoreply when a new mail is received,Jawab otomatis ketika email baru diterima
 Available,Tersedia
-Available Qty at Warehouse,Qty Tersedia di Gudang
+Available Qty at Warehouse,Jumlah Tersedia di Gudang
 Available Stock for Packing Items,Tersedia Stock untuk Packing Produk
 "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tersedia dalam BOM, Pengiriman Catatan, Purchase Invoice, Pesanan Produksi, Purchase Order, Penerimaan Pembelian, Faktur Penjualan, Sales Order, Stock Masuk, Timesheet"
 Average Age,Rata-rata Usia
 Average Commission Rate,Rata-rata Komisi Tingkat
 Average Discount,Rata-rata Diskon
-Awesome Products,Mengagumkan Produk
-Awesome Services,Layanan yang mengagumkan
+Awesome Products,Produk Mengagumkan
+Awesome Services,Layanan mengagumkan
 BOM Detail No,No. Rincian BOM
 BOM Explosion Item,BOM Ledakan Barang
 BOM Item,Komponen BOM
@@ -316,13 +315,13 @@ BOM {0} for Item {1} in row {2} is inactive or not submitted,BOM {0} untuk Item
 BOM {0} is not active or not submitted,BOM {0} tidak aktif atau tidak tersubmit
 BOM {0} is not submitted or inactive BOM for Item {1},BOM {0} tidak tersubmit atau BOM tidak aktif untuk Item {1}
 Backup Manager,Backup Manager
-Backup Right Now,Backup Right Now
+Backup Right Now,Backup Sekarang Juga
 Backups will be uploaded to,Backup akan di-upload ke
-Balance Qty,Balance Qty
+Balance Qty,Jumlah Saldo
 Balance Sheet,Neraca
 Balance Value,Nilai Saldo
 Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
-Balance must be,Balance harus
+Balance must be,Saldo harus
 "Balances of Accounts of type ""Bank"" or ""Cash""","Saldo Rekening jenis ""Bank"" atau ""Cash"""
 Bank,Bank
 Bank / Cash Account,Bank / Rekening Kas
@@ -3159,8 +3158,8 @@ Voucher Type,Voucher Type
 Voucher Type and Date,Voucher Jenis dan Tanggal
 Walk In,Walk In
 Warehouse,Gudang
-Warehouse Contact Info,Gudang Info Kontak
-Warehouse Detail,Gudang Detil
+Warehouse Contact Info,Info Kontak Gudang
+Warehouse Detail,Detil Gudang 
 Warehouse Name,Gudang Nama
 Warehouse and Reference,Gudang dan Referensi
 Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
@@ -3175,7 +3174,7 @@ Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tida
 Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
 Warehouse {0} does not exist,Gudang {0} tidak ada
 Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
-Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun Parent {1} tidak Bolong kepada perusahaan {2}
+Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
 Warehouse-Wise Stock Balance,Gudang-Wise Stock Balance
 Warehouse-wise Item Reorder,Gudang-bijaksana Barang Reorder
 Warehouses,Gudang
@@ -3251,7 +3250,7 @@ You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan
 You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk record ini. Silakan Update 'Status' dan Simpan
 You are the Leave Approver for this record. Please Update the 'Status' and Save,Anda adalah Leave Approver untuk record ini. Silakan Update 'Status' dan Simpan
 You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
-You can enter the minimum quantity of this item to be ordered.,Anda dapat memasukkan jumlah minimum dari item ini yang akan dipesan.
+You can enter the minimum quantity of this item to be ordered.,Anda dapat memasukkan jumlah minimum dari item yang akan dipesan.
 You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah tingkat jika BOM disebutkan agianst item
 You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Anda tidak dapat memasukkan kedua Delivery Note ada dan Faktur Penjualan No Masukkan salah satu.
 You can not enter current voucher in 'Against Journal Voucher' column,Anda tidak bisa masuk voucher saat ini di 'Melawan Journal Voucher' kolom
@@ -3260,19 +3259,19 @@ You can start by selecting backup frequency and granting access for sync,Anda da
 You can submit this Stock Reconciliation.,Anda bisa mengirimkan ini Stock Rekonsiliasi.
 You can update either Quantity or Valuation Rate or both.,Anda dapat memperbarui baik Quantity atau Tingkat Penilaian atau keduanya.
 You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
-You have entered duplicate items. Please rectify and try again.,Anda telah memasuki duplikat item. Harap memperbaiki dan coba lagi.
+You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan item yang sama. Harap diperbaiki dan coba lagi.
 You may need to update: {0},Anda mungkin perlu memperbarui: {0}
-You must Save the form before proceeding,Anda harus Simpan formulir sebelum melanjutkan
-Your Customer's TAX registration numbers (if applicable) or any general information,Nomor registrasi PAJAK Pelanggan Anda (jika ada) atau informasi umum setiap
+You must Save the form before proceeding,Anda harus menyimpan formulir sebelum melanjutkan
+Your Customer's TAX registration numbers (if applicable) or any general information,Nomor registrasi PAJAK Pelanggan Anda (jika ada) atau informasi umum lainnya
 Your Customers,Pelanggan Anda
 Your Login Id,Login Id Anda
 Your Products or Services,Produk atau Jasa
 Your Suppliers,Pemasok Anda
 Your email address,Alamat email Anda
-Your financial year begins on,Tahun buku Anda dimulai di
+Your financial year begins on,Tahun pembukuan Anda dimulai
 Your financial year ends on,Tahun keuangan Anda berakhir pada
-Your sales person who will contact the customer in future,Orang sales Anda yang akan menghubungi pelanggan di masa depan
-Your sales person will get a reminder on this date to contact the customer,Orang penjualan Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi pelanggan
+Your sales person who will contact the customer in future,Sales Anda yang akan menghubungi pelanggan di masa depan
+Your sales person will get a reminder on this date to contact the customer,Sales Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi pelanggan
 Your setup is complete. Refreshing...,Setup Anda selesai. Refreshing ...
 Your support email id - must be a valid email - this is where your emails will come!,Dukungan email id Anda - harus email yang valid - ini adalah di mana email akan datang!
 [Error],[Kesalahan]

erpnext/translations/pl.csv

@@ -1187,7 +1187,7 @@ If more than one package of the same type (for print),If more than one package o
 If not applicable please enter: NA,If not applicable please enter: NA
 "If not checked, the list will have to be added to each Department where it has to be applied.","If not checked, the list will have to be added to each Department where it has to be applied."
 "If specified, send the newsletter using this email address","If specified, send the newsletter using this email address"
-"If the account is frozen, entries are allowed to restricted users.","If the account is frozen, entries are allowed to restricted users."
+"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 "If this Account represents a Customer, Supplier or Employee, set it here.","If this Account represents a Customer, Supplier or Employee, set it here."
 If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt
 If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity
@@ -1195,7 +1195,7 @@ If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged
 "If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.","If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below."
 "If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page"
 If you involve in manufacturing activity. Enables Item 'Is Manufactured',If you involve in manufacturing activity. Enables Item 'Is Manufactured'
-Ignore,Ignore
+Ignore,Ignoruj
 Ignored: ,Ignored: 
 Image,Obrazek
 Image View,Image View
@@ -1629,7 +1629,7 @@ Monthly Attendance Sheet,Monthly Attendance Sheet
 Monthly Earning & Deduction,Monthly Earning & Deduction
 Monthly Salary Register,Monthly Salary Register
 Monthly salary statement.,Monthly salary statement.
-More Details,More Details
+More Details,Więcej szczegółów
 More Info,Więcej informacji
 Motion Picture & Video,Motion Picture & Video
 Moving Average,Moving Average
@@ -2417,10 +2417,10 @@ Sales Email Settings,Sales Email Settings
 Sales Expenses,Koszty Sprzedaży
 Sales Extras,Sales Extras
 Sales Funnel,Sales Funnel
-Sales Invoice,Sales Invoice
+Sales Invoice,Faktura sprzedaży
 Sales Invoice Advance,Sales Invoice Advance
 Sales Invoice Item,Sales Invoice Item
-Sales Invoice Items,Sales Invoice Items
+Sales Invoice Items,Pozycje na Fakturze sprzedaży
 Sales Invoice Message,Sales Invoice Message
 Sales Invoice No,Nr faktury sprzedażowej
 Sales Invoice Trends,Sales Invoice Trends
@@ -2510,7 +2510,7 @@ Select your home country and check the timezone and currency.,Wybierz kraj oraz
 "Selecting ""Yes"" will allow you to make a Production Order for this item.","Selecting ""Yes"" will allow you to make a Production Order for this item."
 "Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master."
 Selling,Sprzedaż
-Selling Settings,Selling Settings
+Selling Settings,Ustawienia Sprzedaży
 Send,Wyślij
 Send Autoreply,Send Autoreply
 Send Email,Send Email
@@ -2709,7 +2709,7 @@ Supplier Addresses and Contacts,Supplier Addresses and Contacts
 Supplier Details,Szczegóły dostawcy
 Supplier Intro,Supplier Intro
 Supplier Invoice Date,Supplier Invoice Date
-Supplier Invoice No,Supplier Invoice No
+Supplier Invoice No,Nr faktury dostawcy
 Supplier Name,Nazwa dostawcy
 Supplier Naming By,Supplier Naming By
 Supplier Part Number,Numer katalogowy dostawcy