Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.0.15'
+__version__ = '5.0.16'

erpnext/controllers/accounts_controller.py

@@ -334,7 +334,7 @@ class AccountsController(TransactionBase):
 @frappe.whitelist()
 def get_tax_rate(account_head):
 	return frappe.db.get_value("Account", account_head, "tax_rate")
-	
+
 @frappe.whitelist()
 def get_default_taxes_and_charges(master_doctype):
 	default_tax = frappe.db.get_value(master_doctype, {"is_default": 1})

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe 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 = "5.0.15"
+app_version = "5.0.16"
 
 error_report_email = "support@erpnext.com"
 
@@ -38,16 +38,14 @@ website_route_rules = [
 	{"from_route": "/invoices", "to_route": "Sales Invoice"},
 	{"from_route": "/invoices/<path:name>", "to_route": "print", "defaults": {"doctype": "Sales Invoice"}},
 	{"from_route": "/shipments", "to_route": "Delivery Note"},
-	{"from_route": "/shipments/<path:name>", "to_route": "print", "defaults": {"doctype": "Delivery Note"}},
+	{"from_route": "/shipments/<path:name>", "to_route": "print", "defaults": {"doctype": "Delivery Note"}}
-	{"from_route": "/issues", "to_route": "Issue"},
-	{"from_route": "/issues/<path:name>", "to_route": "print", "defaults": {"doctype": "Issue"}},
-	{"from_route": "/addresses", "to_route": "Address"},
 ]
 
 has_website_permission = {
 	"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Sales Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
-	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission"
+	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
+	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission"
 }
 
 dump_report_map = "erpnext.startup.report_data_map.data_map"

erpnext/patches.txt

@@ -161,4 +161,5 @@ erpnext.patches.v5_0.set_footer_address
 execute:frappe.db.set_value("Backup Manager", None, "send_backups_to_dropbox", 1 if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox") in ("Daily", "Weekly") else 0)
 execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
 erpnext.patches.v5_0.update_item_and_description_again
-erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
+erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
+erpnext.patches.v5_0.portal_fixes

erpnext/patches/v5_0/portal_fixes.py

@@ -0,0 +1,3 @@
+def execute():
+	import erpnext.setup.install
+	erpnext.setup.install.add_web_forms()

erpnext/setup/fixtures/web_form/addresses.json

@@ -0,0 +1,167 @@
+[
+ {
+  "allow_comments": 0, 
+  "allow_delete": 0, 
+  "allow_edit": 1, 
+  "allow_multiple": 1, 
+  "breadcrumbs": null, 
+  "doc_type": "Address", 
+  "docstatus": 0, 
+  "doctype": "Web Form", 
+  "introduction_text": null, 
+  "login_required": 1, 
+  "modified": "2015-06-01 06:53:43.699336", 
+  "name": "addresses", 
+  "page_name": "addresses", 
+  "published": 1, 
+  "success_message": null, 
+  "success_url": "/addresses", 
+  "title": "Addresses", 
+  "web_form_fields": [
+   {
+    "default": null, 
+    "description": "", 
+    "fieldname": "address_title", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Address Title", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "address_type", 
+    "fieldtype": "Select", 
+    "hidden": 0, 
+    "label": "Address Type", 
+    "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "address_line1", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Address Line 1", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "address_line2", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Address Line 2", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "city", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "City/Town", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "state", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "State", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "pincode", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Pincode", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "country", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Country", 
+    "options": "Country", 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": null, 
+    "fieldtype": "Column Break", 
+    "hidden": null, 
+    "label": null, 
+    "options": null, 
+    "read_only": null, 
+    "reqd": null
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "email_id", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Email Id", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "phone", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Phone", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": "0", 
+    "description": "", 
+    "fieldname": "is_primary_address", 
+    "fieldtype": "Check", 
+    "hidden": 0, 
+    "label": "Preferred Billing Address", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": "0", 
+    "description": "", 
+    "fieldname": "is_shipping_address", 
+    "fieldtype": "Check", 
+    "hidden": 0, 
+    "label": "Preferred Shipping Address", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }
+  ], 
+  "web_page_link_text": null
+ }
+]

erpnext/setup/fixtures/web_form/issues.json

@@ -0,0 +1,68 @@
+[
+ {
+  "allow_comments": 1, 
+  "allow_delete": 1, 
+  "allow_edit": 1, 
+  "allow_multiple": 1, 
+  "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", 
+  "doc_type": "Issue", 
+  "docstatus": 0, 
+  "doctype": "Web Form", 
+  "introduction_text": null, 
+  "login_required": 1, 
+  "modified": "2015-06-01 08:14:26.350792", 
+  "name": "issues", 
+  "page_name": "issues", 
+  "published": 1, 
+  "success_message": "", 
+  "success_url": "/issues", 
+  "title": "Issues", 
+  "web_form_fields": [
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "subject", 
+    "fieldtype": "Data", 
+    "hidden": 0, 
+    "label": "Subject", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 1
+   }, 
+   {
+    "default": "Open", 
+    "description": null, 
+    "fieldname": "status", 
+    "fieldtype": "Select", 
+    "hidden": null, 
+    "label": "Status", 
+    "options": "Open\nReplied\nHold\nClosed", 
+    "read_only": 1, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "description", 
+    "fieldtype": "Text", 
+    "hidden": 0, 
+    "label": "Description", 
+    "options": null, 
+    "read_only": 0, 
+    "reqd": 0
+   }, 
+   {
+    "default": null, 
+    "description": null, 
+    "fieldname": "attachment", 
+    "fieldtype": "Attach", 
+    "hidden": null, 
+    "label": "Attachment", 
+    "options": null, 
+    "read_only": null, 
+    "reqd": null
+   }
+  ], 
+  "web_page_link_text": null
+ }
+]

erpnext/setup/install.py

@@ -15,6 +15,7 @@ def after_install():
 	feature_setup()
 	from erpnext.setup.page.setup_wizard.setup_wizard import add_all_roles_to
 	add_all_roles_to("Administrator")
+	add_web_forms()
 	frappe.db.commit()
 
 def feature_setup():
@@ -48,3 +49,12 @@ def set_single_defaults():
 				pass
 
 	frappe.db.set_default("date_format", "dd-mm-yyyy")
+
+def add_web_forms():
+	"""Import web forms for Issues and Addresses"""
+	from frappe.modules.import_file import import_file_by_path
+
+	import_file_by_path(frappe.get_app_path("erpnext", "setup/fixtures/web_form/issues.json"),
+		data_import=True)
+	import_file_by_path(frappe.get_app_path("erpnext", "setup/fixtures/web_form/addresses.json"),
+		data_import=True)

erpnext/shopping_cart/cart.py

@@ -5,17 +5,18 @@ from __future__ import unicode_literals
 import frappe
 from frappe import throw, _
 import frappe.defaults
-from frappe.utils import flt, get_fullname, fmt_money, cstr
+from frappe.utils import cint, flt, get_fullname, fmt_money, cstr
 from erpnext.utilities.doctype.address.address import get_address_display
 from frappe.utils.nestedset import get_root_of
 
 class WebsitePriceListMissingError(frappe.ValidationError): pass
 
 def set_cart_count(quotation=None):
-	if not quotation:
+	if cint(frappe.db.get_singles_value("Shopping Cart Settings", "enabled")):
-		quotation = _get_cart_quotation()
+		if not quotation:
-	cart_count = cstr(len(quotation.get("items")))
+			quotation = _get_cart_quotation()
-	frappe.local.cookie_manager.set_cookie("cart_count", cart_count)
+		cart_count = cstr(len(quotation.get("items")))
+		frappe.local.cookie_manager.set_cookie("cart_count", cart_count)
 
 @frappe.whitelist()
 def get_cart_quotation(doc=None):
@@ -29,7 +30,7 @@ def get_cart_quotation(doc=None):
 	return {
 		"doc": decorate_quotation_doc(doc),
 		"addresses": [{"name": address.name, "display": address.display}
-			for address in get_address_docs(party)],
+			for address in get_address_docs(party=party)],
 		"shipping_rules": get_applicable_shipping_rules(party)
 	}
 
@@ -281,12 +282,13 @@ def get_lead_or_customer():
 
 		return lead_doc
 
-def get_address_docs(party=None):
+def get_address_docs(doctype, txt, filters, limit_start, limit_page_length=20, party=None):
 	if not party:
 		party = get_lead_or_customer()
 
 	address_docs = frappe.db.sql("""select * from `tabAddress`
-		where `%s`=%s order by name""" % (party.doctype.lower(), "%s"), party.name,
+		where `{0}`=%s order by name limit {1}, {2}""".format(party.doctype.lower(),
+			limit_start, limit_page_length), party.name,
 		as_dict=True, update={"doctype": "Address"})
 
 	for address in address_docs:

erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py

@@ -8,7 +8,7 @@ import frappe
 from frappe import _, msgprint
 from frappe.utils import comma_and
 from frappe.model.document import Document
-from frappe.utils.nestedset import get_ancestors_of
+from frappe.utils.nestedset import get_ancestors_of, get_root_of
 from erpnext.utilities.doctype.address.address import get_territory_from_address
 
 class ShoppingCartSetupError(frappe.ValidationError): pass
@@ -42,7 +42,7 @@ class ShoppingCartSettings(Document):
 		return territory_name_map
 
 	def validate_price_lists(self):
-		territory_name_map = self.validate_overlapping_territories("price_lists", "selling_price_list")
+		self.validate_overlapping_territories("price_lists", "selling_price_list")
 
 		# validate that a Shopping Cart Price List exists for the default territory as a catch all!
 		price_list_for_default_territory = self.get_name_from_territory(self.default_territory, "price_lists",
@@ -131,7 +131,8 @@ class ShoppingCartSettings(Document):
 	def get_price_list(self, billing_territory):
 		price_list = self.get_name_from_territory(billing_territory, "price_lists", "selling_price_list")
 		if not (price_list and price_list[0]):
-			price_list = self.get_name_from_territory(self.default_territory, "price_lists", "selling_price_list")
+			price_list = self.get_name_from_territory(self.default_territory or get_root_of("Territory"),
+				"price_lists", "selling_price_list")
 
 		return price_list and price_list[0] or None
 
@@ -165,7 +166,7 @@ def is_cart_enabled():
 	return get_shopping_cart_settings().enabled
 
 def get_default_territory():
-	return get_shopping_cart_settings().default_territory
+	return get_shopping_cart_settings().default_territory or get_root_of("Territory")
 
 def check_shopping_cart_enabled():
 	if not get_shopping_cart_settings().enabled:

erpnext/shopping_cart/utils.py

@@ -6,7 +6,6 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 import frappe.defaults
-from frappe.utils import cint
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
 
 def show_cart_count():
@@ -44,6 +43,6 @@ def update_my_account_context(context):
 		{"label": _("Orders"), "url": "orders"},
 		{"label": _("Invoices"), "url": "invoices"},
 		{"label": _("Shipments"), "url": "shipments"},
-		# {"label": _("Issues"), "url": "tickets"},
+		{"label": _("Issues"), "url": "issues"},
 		{"label": _("Addresses"), "url": "addresses"},
 	])

erpnext/support/doctype/issue/issue.json

@@ -66,7 +66,7 @@
    "oldfieldtype": "Data", 
    "options": "Email", 
    "permlevel": 0, 
-   "reqd": 1
+   "reqd": 0
   }, 
   {
    "fieldname": "fold", 
@@ -229,11 +229,19 @@
    "hidden": 1, 
    "label": "Content Type", 
    "permlevel": 0
+  }, 
+  {
+   "fieldname": "attachment", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "label": "Attachment", 
+   "permlevel": 0, 
+   "precision": ""
   }
  ], 
  "icon": "icon-ticket", 
  "idx": 1, 
- "modified": "2015-05-28 03:21:04.690112", 
+ "modified": "2015-06-01 08:14:01.750421", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 

erpnext/support/doctype/issue/issue.py

@@ -17,6 +17,8 @@ class Issue(Document):
 		return "{0}: {1}".format(_(self.status), self.subject)
 
 	def validate(self):
+		if not self.raised_by:
+			self.raised_by = frappe.session.user
 		self.update_status()
 		self.set_lead_contact(self.raised_by)
 
@@ -54,7 +56,8 @@ class Issue(Document):
 def get_list_context(context=None):
 	return {
 		"title": _("My Issues"),
-		"get_list": get_issue_list
+		"get_list": get_issue_list,
+		"row_template": "templates/includes/issue_row.html"
 	}
 
 def get_issue_list(doctype, txt, filters, limit_start, limit_page_length=20):
@@ -84,3 +87,6 @@ def set_multiple_status(names, status):
 	names = json.loads(names)
 	for name in names:
 		set_status(name, status)
+
+def has_website_permission(doc, ptype, user, verbose=False):
+	return doc.raised_by==user

erpnext/templates/generators/item.html

@@ -2,10 +2,13 @@
 
 {% block header %}<h2>{{ title }}</h2>{% endblock %}
 
+{% block header_actions %}
+{% include 'templates/includes/product_search_box.html' %}
+{% endblock %}
+
 {% block content %}
 {% from "erpnext/templates/includes/macros.html" import product_image %}
 <div class="item-content">
-	{% include 'templates/includes/product_search_box.html' %}
 	<div class="product-page-content" itemscope itemtype="http://schema.org/Product">
 		<div class="row">
 			<div class="col-sm-5">

erpnext/templates/generators/item_group.html

@@ -1,6 +1,9 @@
+{% block header_actions %}
+{% include 'templates/includes/product_search_box.html' %}
+{% endblock %}
+
 {% block content %}
 <div class="item-group-content">
-	{% include 'templates/includes/product_search_box.html' %}
 	<div>
 		{% if slideshow %}<!-- slideshow -->
 		{% include "templates/includes/slideshow.html" %}

erpnext/templates/includes/address_row.html

@@ -0,0 +1,20 @@
+<div class="web-list-item">
+    <a href="/addresses?name={{ doc.name }}" no-pjax>
+    <div class="row">
+        <div class="col-sm-4">
+            <span class="strong">{{ doc.address_title }}</span>
+        </div>
+        <div class="col-sm-2">
+            {{ doc.address_type }}
+        </div>
+        <div class="col-sm-4">
+            {{ doc.address_line1 }}<br>
+            {% if doc.address_line2 %}{{ doc.address_line2 }}<br>{% endif %}
+            {{ doc.city }}<br>
+        </div>
+        <div class="col-sm-2">
+            {% if doc.state %}{{ doc.state }}, {% endif %}{{ doc.country }}
+        </div>
+    </div>
+    </a>
+</div>

erpnext/templates/includes/issue_row.html

@@ -0,0 +1,16 @@
+<div class="web-list-item">
+    <div class="row">
+        <div class="col-sm-8">
+            <a class="no-decoration" href="/issues?name={{ doc.name }}" no-pjax>
+                {{ doc.subject }}
+            </a>
+        </div>
+        <div class="col-sm-2">
+            <span class="indicator {{ "red" if doc.status=="Open" else "blue" }}">
+                {{ doc.status }}</span>
+        </div>
+        <div class="col-sm-2 text-muted text-right small">
+            {{ frappe.format_date(doc.creation) }}
+        </div>
+    </div>
+</div>

erpnext/templates/includes/product_in_grid.html

@@ -1,6 +1,6 @@
 {% from "erpnext/templates/includes/macros.html" import product_image_square %}
 
-<a class="product-link" href="{{ (route or page_name)|with_leading_slash }}">
+<a class="product-link" href="{{ (route or page_name)|abs_url }}">
 	<div class="col-sm-2 col-xs-4 product-image-wrapper">
 		{{ product_image_square(website_image) }}
 		<div class="text-ellipsis inline-block small product-text">{{ item_name }}</div>

erpnext/templates/includes/product_in_list.html

@@ -1,15 +1,15 @@
 <!-- TODO product listing -->
 <div class="container content">
 	<div style="height: 120px; overflow: hidden;">
-		<a href="{{ (route or page_name)|with_leading_slash }}">
+		<a href="{{ (route or page_name)|abs_url }}">
 		{%- if website_image -%}
-		<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image|with_leading_slash }}">
+		<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image|abs_url }}">
 		{%- else -%}
         <div style="width: 80%; height: 120px; background-color: #F7FAFC;"></div>
 		{%- endif -%}
 		</a>
 	</div>
 	<div style="height: 100px; overflow: hidden; font-size: 80%;">
-		<div><a href="{{ (route or page_name)|with_leading_slash }}">{{ item_name }}</a></div>
+		<div><a href="{{ (route or page_name)|abs_url }}">{{ item_name }}</a></div>
 	</div>
 </div>

erpnext/templates/includes/product_search_box.html

@@ -1,20 +1,17 @@
+<div class="product-search pull-right">
+	<form class="form-inline form-search">
+    	<div class="input-group">
+    		<input class="form-control" type="text" id="product-search"
+                placeholder="Product Search...">
+    		<span class="input-group-btn">
+    			<button class="btn btn-default" type="button" id="btn-product-search">
+    				<i class="icon-search"></i></button>
+    		</span>
+    	</div>
+    </form>
+</div>
 <script>
 frappe.ready(function() {
-	$(".product-search").remove();
-
-	$('<div class="product-search pull-right">\
-			<form class="form-inline form-search">\
-			<div class="input-group">\
-				<input class="form-control" type="text" id="product-search" placeholder="Product Search...">\
-				<span class="input-group-btn">\
-					<button class="btn btn-default" type="button" id="btn-product-search">\
-						<i class="icon-search"></i></button>\
-				</span>\
-			</div>\
-		</form>\
-	</div>').prependTo(".page-header-block");
-
-	$('.dropdown-toggle').dropdown();
 	$("#btn-product-search").click(function() {
 		var txt = $("#product-search").val();
 		if(txt) {

erpnext/templates/includes/transaction_row.html

@@ -1,5 +1,6 @@
 {% set doc = frappe.get_doc(doc) %}
-<a class="website-list-row" href="/{{ pathname }}/{{ doc.name }}" no-pjax>
+<div class="web-list-item">
+<a href="/{{ pathname }}/{{ doc.name }}" no-pjax>
 <div class="row">
 	<div class="col-sm-6 col-xs-7">
 		<div class="row">
@@ -12,7 +13,7 @@
 					<span class="indicator orange">{{ doc.status_display }}</span>
 					{%- endif -%}
 				{%- elif doc.status -%}
-					<span class="indicator">{{ doc.status }}</span>
+					<span class="indicator blue">{{ doc.status }}</span>
 				{%- endif -%}
 			</div>
 		</div>
@@ -27,4 +28,4 @@
 		{{ frappe.utils.pretty_date(doc.creation) }}</div>
 </div>
 </a>
-
+</div>

erpnext/templates/pages/address.html

@@ -1,112 +0,0 @@
-{% block title %} {{ title }} {% endblock %}
-
-{% block header %}<h2>{{ title }}</h2>{% endblock %}
-
-{% block content %}
-{% macro render_fields(docfields) -%}
-{% for df in docfields -%}
-	{% if df.fieldtype == "Data" -%}
-	<fieldset>
-		<label>{{ df.label }}</label>
-		<input class="form-control" type="text" placeholder="Type {{ df.label }}"
-			data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
-			{% if doc and doc.get(df.fieldname) -%} value="{{ doc[df.fieldname] }}" {%- endif %}>
-	</fieldset>
-	{% elif df.fieldtype == "Check" -%}
-	<fieldset class="checkbox">
-		<label><input type="checkbox" data-fieldname="{{ df.fieldname }}"
-			data-fieldtype="{{ df.fieldtype }}"
-			{% if doc and frappe.utils.cint(doc.get(df.fieldname)) -%} checked="checked" {%- endif %}>
-			{{ df.label }}</label>
-	</fieldset>
-	{% elif df.fieldtype in ("Select", "Link") -%}
-	<fieldset>
-		{% set select_options = frappe.get_list(df.options)|map(attribute="name")
-			if df.fieldtype == "Link" else df.options.split("\n") %}
-		<label>{{ df.label }}</label>
-		<select class="form-control" data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}">
-			{% for value in select_options -%}
-			{% if doc and doc.get(df.fieldname) == value -%}
-			<option selected="selected">{{ value }}</option>
-			{% else -%}
-			<option>{{ value }}</option>
-			{%- endif %}
-			{%- endfor %}
-		</select>
-	</fieldset>
-	{%- endif %}
-{%- endfor %}
-{%- endmacro %}
-
-<div class="container content">
-    <ul class="breadcrumb">
-    	<li><a href="/index">Home</a></li>
-    	<li><a href="/addresses">My Addresses</a></li>
-    	<li class="active"><i class="icon-map-marker icon-fixed-width"></i> {{ title }}</li>
-    </ul>
-	<h3><i class="icon-map-marker icon-fixed-width"></i> {{ title }}</h3>
-	<button type="button" class="btn btn-primary pull-right" id="address-save"><i class="icon-ok"></i>
-		{{ doc and "Save" or "Insert" }}</button>
-	<div class="clearfix"></div>
-	<hr>
-	<div id="address-error" class="alert alert-danger" style="display:none"></div>
-	<form autocomplete="on">
-		<div class="row">
-			<section class="col-md-6">
-				{{ render_fields(meta.left_fields) }}
-			</section>
-			<section class="col-md-6">
-				{{ render_fields(meta.right_fields) }}
-			</section>
-		</section>
-	</form>
-</div>
-
-<script>
-;(function() {
-	console.log("yoyo");
-	frappe.ready(function() {
-		bind_save();
-	});
-
-	var bind_save = function() {
-		$("#address-save").on("click", function() {
-			console.log("clicked!");
-
-			var fields = {
-				name: "{{ docname or '' }}"
-			};
-
-			$("form").find("[data-fieldname]").each(function(i, input) {
-				var $input = $(input);
-				var fieldname = $(input).attr("data-fieldname");
-				var fieldtype = $(input).attr("data-fieldtype");
-
-				if(fieldtype == "Check") {
-					fields[fieldname] = $input.is(":checked") ? 1 : 0;
-				} else {
-					fields[fieldname] = $input.val();
-				}
-			});
-
-			frappe.call({
-				btn: $(this),
-				type: "POST",
-				method: "erpnext.templates.pages.address.save_address",
-				args: { fields: fields, address_fieldname: get_url_arg("address_fieldname") },
-				error_msg: "#address-error",
-				callback: function(r) {
-					if(get_url_arg("address_fieldname")) {
-						window.location.href = "cart";
-					} else {
-						window.location.href = "address?name=" + encodeURIComponent(r.message);
-					}
-				}
-			});
-		});
-	};
-})();
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}

erpnext/templates/pages/address.py

@@ -1,62 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import json
-
-import frappe
-from erpnext.shopping_cart.cart import get_lead_or_customer, update_cart_address
-from frappe.desk.form.meta import get_meta
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
-	def _get_fields(fieldnames):
-		return [frappe._dict(zip(["label", "fieldname", "fieldtype", "options"],
-				[df.label, df.fieldname, df.fieldtype, df.options]))
-			for df in get_meta("Address").get("fields", {"fieldname": ["in", fieldnames]})]
-
-	docname = doc = None
-	title = "New Address"
-	if frappe.form_dict.name:
-		doc = frappe.get_doc("Address", frappe.form_dict.name)
-		docname = doc.name
-		title = doc.name
-
-	return {
-		"doc": doc,
-		"meta": frappe._dict({
-			"left_fields": _get_fields(["address_title", "address_type", "address_line1", "address_line2",
-				"city", "state", "pincode", "country"]),
-			"right_fields": _get_fields(["email_id", "phone", "fax", "is_primary_address",
-				"is_shipping_address"])
-		}),
-		"docname": docname,
-		"title": title
-	}
-
-@frappe.whitelist()
-def save_address(fields, address_fieldname=None):
-	party = get_lead_or_customer()
-	fields = json.loads(fields)
-
-	if fields.get("name"):
-		doc = frappe.get_doc("Address", fields.get("name"))
-	else:
-		doc = frappe.get_doc({"doctype": "Address", "__islocal": 1})
-
-	doc.update(fields)
-
-	party_fieldname = party.doctype.lower()
-	doc.update({
-		party_fieldname: party.name,
-		(party_fieldname + "_name"): party.get(party_fieldname + "_name")
-	})
-	doc.flags.ignore_permissions = True
-	doc.save()
-
-	if address_fieldname:
-		update_cart_address(address_fieldname, doc.name)
-
-	return doc.name

erpnext/templates/pages/addresses.html

@@ -1,50 +0,0 @@
-{% block title %} {{ "My Addresses" }} {% endblock %}
-
-{% block header %}<h2>My Addresses</h2>{% endblock %}
-
-{% block breadcrumbs %}{% include "templates/includes/breadcrumbs.html" %}{% endblock %}
-
-{% block content %}
-<div class="addresses-content">
-	<p><a class="btn btn-default" href="/address"><i class="icon-plus"> New Address</i></a></p>
-	<hr>
-	<div id="address-list">
-		<div class="text-muted progress">{{ _("Loading") }}...</div>
-	</div>
-</div>
-
-<script>
-;(function() {
-	var fetch_addresses = function() {
-		frappe.call({
-			method: "erpnext.templates.pages.addresses.get_addresses",
-			callback: function(r) {
-				$("#address-list .progress").remove();
-				var $list = $("#address-list");
-
-				if(!(r.message && r.message.length)) {
-					$list.html("<div class='alert'>No Addresses Found</div>");
-					return;
-				}
-
-				$.each(r.message, function(i, address) {
-					address.url_name = encodeURIComponent(address.name);
-					$(repl('<div> \
-						<p><a href="/address?name=%(url_name)s">%(name)s</a></p> \
-						<p>%(display)s</p> \
-						<hr> \
-					</div>', address)).appendTo($list);
-				});
-			}
-		});
-	};
-
-	$(document).ready(function() {
-		fetch_addresses();
-	});
-})();
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}
-

erpnext/templates/pages/addresses.py

@@ -1,13 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from erpnext.shopping_cart.cart import get_address_docs
-
-no_cache = 1
-no_sitemap = 1
-
-@frappe.whitelist()
-def get_addresses():
-	return get_address_docs()

erpnext/templates/pages/product_search.html

@@ -2,6 +2,10 @@
 
 {% block header %}<h2>Product Search</h2>{% endblock %}
 
+{% block header_actions %}
+{% include 'templates/includes/product_search_box.html' %}
+{% endblock %}
+
 {% block content %}
 <script>{% include "templates/includes/product_list.js" %}</script>
 
@@ -15,7 +19,6 @@ $(document).ready(function() {
 });
 </script>
 
-{% include "templates/includes/product_search_box.html" %}
 <div class="product-search-content">
 	<h3 class="search-results">Search Results</h3>
 	<div id="search-list" class="row">

erpnext/templates/pages/ticket.html

@@ -1,116 +0,0 @@
-{% block title %} {{ title }} {% endblock %}
-
-{% block header %}<h2><i class="icon-ticket icon-fixed-width"></i> {{ title }}</h2>{% endblock %}
-
-{% block content %}
-{% set status_label = {
-	"Open": "label-success",
-	"To Reply": "label-danger",
-	"Closed": "label-default"
-} %}
-
-<div class="ticket-content">
-    <ul class="breadcrumb">
-    	<li><a href="/index">Home</a></li>
-    	<li><a href="/tickets">My Tickets</a></li>
-    	<li class="active"><i class="icon-ticket icon-fixed-width"></i> {{ doc.name or "" }}</li>
-    </ul>
-	{% if not doc -%}
-		<script>ask_to_login();</script>
-	{% else %}
-	<hr>
-	{%- if doc.status -%}
-	{% if doc.status == "Waiting for Customer" -%}
-		{% set status = "To Reply" %}
-	{% else %}
-		{% set status = doc.status %}
-	{%- endif -%}
-	<div class="row">
-		<div class="col-md-2" style="margin-bottom: 7px;">
-			<span class="label {{ status_label.get(status) or 'label-default' }}">{{ status }}</span>
-		</div>
-		<div class="col-md-8">
-			<div class="row col-md-12">{{ doc.subject }}</div>
-		</div>
-		<div class="col-md-2">
-			<span class="text-muted pull-right">{{ frappe.utils.formatdate(doc.creation) }}</span>
-		</div>
-	</div>
-	<div class="row">
-		<h4 class="col-xs-6">Messages</h4>
-		<div class="col-xs-6">
-			 <button class="btn btn-sm btn-primary pull-right" id="ticket-reply">
-				  <i class="icon-envelope icon-fixed-width"></i> Reply</button>
-			 <button class="btn btn-sm btn-success pull-right hide" id="ticket-reply-send">
-				  <i class="icon-arrow-right icon-fixed-width"></i> Send</button>
-		</div>
-	</div>
-	<p id="ticket-alert" class="alert alert-danger"
-		style="display: none;">&nbsp;</p>
-	<div>
-		<table class="table table-bordered table-striped" id="ticket-thread">
-			<tbody>
-				{%- for comm in
-					(doc.get({"doctype":"Communication"})|sort(reverse=True, attribute="creation")) %}
-				<tr>
-					<td>
-					<h5 style="text-transform: none">
-						{{ comm.sender }} on {{ frappe.utils.formatdate(comm.creation) }}</h5>
-					<hr>
-					<p>{{ frappe.utils.is_html(comm.content) and comm.content or
-						comm.content.replace("\n", "<br>")}}</p>
-					</td>
-				</tr>
-				{% endfor -%}
-			</tbody>
-		</table>
-	</div>
-	{%- endif -%}
-	{% endif -%}
-</div>
-
-<script>
-$(document).ready(function() {
-	$("#ticket-reply").on("click", function() {
-		if(!$("#ticket-reply-editor").length) {
-			$('<tr id="ticket-reply-editor"><td>\
-				<h5 style="text-transform: none">Reply</h5>\
-				<hr>\
-				<textarea rows=10 class="form-control" style="resize: vertical;"></textarea>\
-			</td></tr>').prependTo($("#ticket-thread").find("tbody"));
-			$("#ticket-reply").addClass("hide");
-			$("#ticket-reply-send").removeClass("hide");
-		}
-	});
-
-	$("#ticket-reply-send").on("click", function() {
-		var reply = $("#ticket-reply-editor").find("textarea").val().trim();
-		if(!reply) {
-			msgprint("Please write something in reply!");
-		} else {
-			frappe.call({
-				type: "POST",
-				method: "erpnext.templates.pages.ticket.add_reply",
-				btn: this,
-				args: { ticket: "{{ doc.name }}", message: reply },
-				callback: function(r) {
-					if(r.exc) {
-						msgprint(r._server_messages
-							? JSON.parse(r._server_messages).join("<br>")
-							: "Something went wrong!");
-					} else {
-						window.location.reload();
-					}
-				}
-			})
-		}
-	});
-});
-
-var msgprint = function(txt) {
-	if(txt) $("#ticket-alert").html(txt).toggle(true);
-}
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}

erpnext/templates/pages/ticket.py

@@ -1,41 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import today
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
-	doc = frappe.get_doc("Issue", frappe.form_dict.name)
-	if doc.raised_by == frappe.session.user:
-		ticket_context = {
-			"title": doc.name,
-			"doc": doc
-		}
-	else:
-		ticket_context = {"title": "Not Allowed", "doc": {}}
-
-	return ticket_context
-
-@frappe.whitelist()
-def add_reply(ticket, message):
-	if not message:
-		raise frappe.throw(_("Please write something"))
-
-	doc = frappe.get_doc("Issue", ticket)
-	if doc.raised_by != frappe.session.user:
-		raise frappe.throw(_("You are not allowed to reply to this ticket."), frappe.PermissionError)
-
-	comm = frappe.get_doc({
-		"doctype":"Communication",
-		"subject": doc.subject,
-		"content": message,
-		"sender": doc.raised_by,
-		"sent_or_received": "Received"
-	})
-	comm.insert(ignore_permissions=True)
-

erpnext/templates/pages/tickets.html

@@ -1,92 +0,0 @@
-{% block title %} {{ title }} {% endblock %}
-
-{% block header %}<h2>{{ title }}</h2>{% endblock %}
-
-{% block content %}
-{% include "templates/includes/transactions.html" %}
-
-<script>
-	var status_label = {
-		"Open": "label-success",
-		"Waiting for Customer": "label-danger",
-		"Closed": "label-default"
-	}
-
-	var render = function(doc) {
-		doc.status = doc.status.trim();
-		doc.label_class = status_label[doc.status] || "label-default";
-		if(doc.status==="Waiting for Customer") doc.status = "To Reply";
-
-		$(repl('<a href="{{ page }}?name=%(name)s" class="list-group-item">\
-				<div class="row">\
-					<div class="col-md-2" style="margin-bottom: 7px;"><span class="label %(label_class)s">\
-						%(status)s</span></div>\
-					<div class="col-md-8">\
-						<div class="row col-md-12">%(name)s</div>\
-						<div class="row col-md-12 text-muted">%(subject)s</div>\
-					</div>\
-					<div class="col-md-2 pull-right">\
-						<span class="text-muted">%(creation)s</span>\
-					</div>\
-				</div>\
-			</a>', doc)).appendTo($list);
-	};
-
-	frappe.ready(function() {
-		if(!window.$new_ticket) {
-			window.$new_ticket = $('<div>\
-					<button class="btn btn-primary" style="margin-bottom: 15px;" id="new-ticket">\
-						<i class="icon-tag icon-fixed-width"></i> New Ticket\
-					</button>\
-					<button class="btn btn-success hide" style="margin-bottom: 15px;" id="new-ticket-send">\
-						<i class="icon-arrow-right icon-fixed-width"></i> Send\
-					</button>\
-				</div>').insertBefore(".transaction-list");
-		}
-
-		window.$new_ticket.find("#new-ticket").on("click", function() {
-			$(this).addClass("hide");
-			$(window.$new_ticket).find("#new-ticket-send").removeClass("hide");
-			$('<div class="well" id="ticket-editor">\
-					<div class="form-group"><input class="form-control" type="data"\
-						 placeholder="Subject" data-fieldname="subject"></div>\
-					<div class="form-group"><textarea rows=10 class="form-control" \
-						 style="resize: vertical;" placeholder="Message" \
-						 data-fieldname="message"></textarea></div>\
-				</div>')
-				.insertAfter(window.$new_ticket);
-		});
-
-		window.$new_ticket.find("#new-ticket-send").on("click", function() {
-			var subject = $("#ticket-editor").find('[data-fieldname="subject"]').val().trim();
-			var message = $("#ticket-editor").find('[data-fieldname="message"]').val().trim();
-			if(!(subject && message)) {
-				msgprint("Please write something in subject and message!");
-			} else {
-				frappe.call({
-					type: "POST",
-					method: "erpnext.templates.pages.tickets.make_new_ticket",
-					btn: this,
-					args: { subject: subject, message: message },
-					callback: function(r) {
-						if(r.exc) {
-							msgprint(r._server_messages
-								? JSON.parse(r._server_messages).join("<br>")
-								: "Something went wrong!");
-						} else {
-							window.location.href = "ticket?name=" + encodeURIComponent(r.message);
-						}
-					}
-				})
-			}
-		});
-	});
-
-	var msgprint = function(txt) {
-		if(txt) $("#msgprint-alert").html(txt).toggle(true);
-	}
-</script>
-
-<!-- no-sidebar -->
-{% endblock %}
-

erpnext/templates/pages/tickets.py

@@ -1,54 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cint, formatdate
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
-	return {
-		"title": "My Tickets",
-		"method": "erpnext.templates.pages.tickets.get_tickets",
-		"icon": "icon-ticket",
-		"empty_list_message": "No Tickets Raised",
-		"page": "ticket"
-	}
-
-@frappe.whitelist()
-def get_tickets(start=0):
-	tickets = frappe.db.sql("""select name, subject, status, creation
-		from `tabIssue` where raised_by=%s
-		order by modified desc
-		limit %s, 20""", (frappe.session.user, cint(start)), as_dict=True)
-	for t in tickets:
-		t.creation = formatdate(t.creation)
-
-	return tickets
-
-@frappe.whitelist()
-def make_new_ticket(subject, message):
-	if not (subject and message):
-		raise frappe.throw(_("Please write something in subject and message!"))
-
-	ticket = frappe.get_doc({
-		"doctype":"Issue",
-		"subject": subject,
-		"raised_by": frappe.session.user,
-	})
-	ticket.insert(ignore_permissions=True)
-
-	comm = frappe.get_doc({
-		"doctype":"Communication",
-		"subject": subject,
-		"content": message,
-		"sender": frappe.session.user,
-		"sent_or_received": "Received",
-		"reference_doctype": "Issue",
-		"reference_name": ticket.name
-	})
-	comm.insert(ignore_permissions=True)
-
-	return ticket.name

erpnext/translations/ar.csv

@@ -22,7 +22,7 @@ DocType: About Us Settings,Website,الموقع
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Compaction plus sintering,الضغط بالإضافة إلى تلبد
 DocType: Sales BOM,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""",العنصر الذي يمثل الحزمة. يجب أن يكون لدى هذا البند "هو المخزون السلعة" ب "لا" و "هل المبيعات السلعة" ب "نعم"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,وسيتم احتساب * في المعاملة.
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,يرجى إدخال رقم الموظف من هذا بارسون المبيعات
 apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},الرجاء تعيين مفاتيح الوصول محرك جوجل في {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,من المواد طلب
@@ -30,18 +30,18 @@ apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0
 DocType: Job Applicant,Job Applicant,طالب العمل
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,قانوني
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},لا يمكن تضمين ضريبة نوع الفعلية في سعر البند في الصف {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},لا يمكن تضمين ضريبة نوع الفعلية في سعر الصنف في الصف {0}
 DocType: C-Form,Customer,زبون
 DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
 DocType: Department,Department,قسم
-DocType: Purchase Order,% Billed,% أصدر من قيمة الفاتورة 
+DocType: Purchase Order,% Billed,% فوترت
 DocType: Selling Settings,Customer Name,اسم العميل
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",هي المجالات ذات الصلة عن تصدير مثل العملة ، ومعدل التحويل ، ومجموع التصدير، تصدير الخ المجموع الكلي المتاحة في توصيل ملاحظة ، ونقاط البيع ، اقتباس، فاتورة المبيعات ، ترتيب المبيعات الخ
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,رؤساء (أو مجموعات) التي تتم ضد القيود المحاسبية ويتم الاحتفاظ التوازنات.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,ترك اسم نوع
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,سلسلة التحديث بنجاح
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Stitching,درز
 DocType: Pricing Rule,Apply On,تنطبق على
 DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
@@ -77,7 +77,7 @@ sites/assets/js/erpnext.min.js +50,Please select Price List,الرجاء اخت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,النجارة
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
 DocType: Company,If Monthly Budget Exceeded,إذا تجاوز الميزانية الشهرية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,3D الطباعة
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,طباعة ثلاثية الأبعاد
 DocType: Employee,Holiday List,عطلة قائمة
 DocType: Time Log,Time Log,وقت دخول
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,محاسب
@@ -120,7 +120,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not auth
 apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,الوالد البند {0} لا يجب أن يكون البند الأسهم و يجب أن يكون تاريخ المبيعات
 DocType: Item,Item Image (if not slideshow),صورة البند (إن لم يكن عرض الشرائح)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,موجود على العملاء مع نفس الاسم
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ساعة السعر / 60) * الفعلي وقت التشغيل
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
 DocType: SMS Log,SMS Log,SMS دخول
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
 DocType: Blog Post,Guest,ضيف
@@ -164,7 +164,7 @@ DocType: Journal Entry,Contra Entry,الدخول كونترا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,عرض الوقت سجلات
 DocType: Email Digest,Bank/Cash Balance,بنك / النقد وما في حكمه
 DocType: Delivery Note,Installation Status,تثبيت الحالة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},يجب أن يكون مقبول مرفوض + الكمية مساوية ل كمية تلقى القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
 DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
 apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,البند {0} يجب أن يكون شراء السلعة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -218,14 +218,14 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telev
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Gashing,Gashing
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} does not belong to Company {1},حساب {0} لا ينتمي إلى شركة {1}
-DocType: Naming Series,Series List for this Transaction,قائمة سلسلة لهذه الصفقة
+DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
 apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},مستودع محفوظة الأسهم المطلوبة لل تفاصيل {0} في {1} الصف
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Supplier,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,ل مطلوب في معرض النماذج ثلاثية قبل إرسال
 DocType: Sales Partner,Reseller,بائع التجزئة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,يرجى إدخال الشركة
-DocType: Delivery Note Item,Against Sales Invoice Item,ضد فاتورة المبيعات البند
+DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات 
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,لصناعة السيارات في رفع طلب مادة إذا يذهب كمية أقل من مستوى إعادة ترتيب في مستودع الافتراضي
 DocType: Journal Entry,Write Off Amount <=,شطب المبلغ &lt;=
@@ -321,7 +321,7 @@ DocType: Backup Manager,Allow Dropbox Access,تسمح قطاف الدخول
 DocType: Communication,Support Manager,مدير الدعم
 DocType: Sales Order Item,Reserved Warehouse,مستودع محفوظة
 apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة المدينة
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 DocType: Workstation,Rent Cost,الإيجار التكلفة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,الرجاء اختيار الشهر والسنة
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",أدخل البريد الإلكتروني معرف مفصولة بفواصل، سوف ترسل الفاتورة تلقائيا على تاريخ معين
@@ -345,14 +345,14 @@ apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +242,Pur
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,يجب تقديم شراء إيصال
 DocType: Stock UOM Replace Utility,Current Stock UOM,الأسهم الحالية UOM
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,دفعة (الكثير) من عنصر.
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,رقم المجموعة للصنف
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","كما أن هناك معاملات المخزون الحالي لهذا البند، لا يمكنك تغيير قيم ""ليس لديه المسلسل '،' لديه دفعة لا '،' هل البند الأسهم"" و ""أسلوب التقييم"""
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","يوجد سجل معاملات المخزون لهذا الصنف، لا يمكنك تغيير قيم ""لديه رقم متسلسل '،' لديه رقم تجميع '،' من صنف المخزون"" و "" طريقة الجرد"""
 apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,عنوان البريد الإلكتروني الخاص بك
 DocType: Email Digest,Income booked for the digest period,حجزت الدخل للفترة هضم
 apps/erpnext/erpnext/config/setup.py +106,Supplier master.,المورد الرئيسي.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,يرجى الاطلاع على المرفقات
-DocType: Purchase Order,% Received,حصل على٪
+DocType: Purchase Order,% Received,تم استلام٪
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,قطع المياه النفاثة
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,الإعداد الكامل بالفعل !
 ,Finished Goods,السلع تامة الصنع
@@ -381,7 +381,7 @@ DocType: Item,"Selecting ""Yes"" will allow this item to figure in Sales Order,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,الرجاء إدخال شراء الإيصال لا على المضي قدما
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) يجب أن يكون دور ""إجازة الموافق"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات) 
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,السبب لفقدان
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,أنبوب الديكور
@@ -396,14 +396,14 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selli
 DocType: Purchase Order,Start date of current order's period,تاريخ الفترة الحالية أجل نبدأ
 apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},لا يمكن أن يكون كمية جزء في الصف {0}
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
-DocType: Delivery Note,% Installed,٪ المثبتة
+DocType: Delivery Note,% Installed,٪ تم تثبيت
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,الرجاء إدخال اسم الشركة الأولى
 DocType: BOM,Item Desription,البند Desription
 DocType: Buying Settings,Supplier Name,اسم المورد
 DocType: Account,Is Group,غير المجموعة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,بالحرارة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,الحز
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;بالقضية رقم&#39; لا يمكن أن يكون أقل من &#39;من القضية رقم&#39;
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','الى الحالة  رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,غير الربح
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,لم تبدأ
 DocType: Lead,Channel Partner,قناة الشريك
@@ -485,7 +485,7 @@ apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid e
  عنوان البريد الإلكتروني"""
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,مجموع الفواتير هذه السنة:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
-DocType: Purchase Invoice,Supplier Invoice No,المورد الفاتورة لا
+DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),إغلاق (الكروم)
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
@@ -565,7 +565,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,م
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,من إيصال الشراء
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
 DocType: SMS Settings,Receiver Parameter,استقبال معلمة
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" المجموعة بواسطة ' لا يمكن أن يكون نفس"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
 DocType: Sales Person,Sales Person Targets,أهداف المبيعات شخص
 sites/assets/js/form.min.js +253,To,إلى
 apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,يرجى إدخال عنوان البريد الإلكتروني
@@ -636,7 +636,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,الموجودات المتداولة
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} ليس من نوع المخزون
 DocType: Mode of Payment Account,Default Account,الافتراضي حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع 
 DocType: Contact Us Settings,Address Title,عنوان عنوان
@@ -746,14 +746,14 @@ DocType: Email Digest,Email Digest Settings,البريد الإلكتروني إ
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,دعم الاستفسارات من العملاء.
 DocType: Bin,Moving Average Rate,الانتقال متوسط ​​معدل
 DocType: Production Planning Tool,Select Items,حدد العناصر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} ضد بيل {1} بتاريخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 DocType: Communication,Reference Name,مرجع اسم
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No",لتتبع اسم العلامة التجارية في الوثائق التالية توصيل ملاحظة ، فرصة ، طلب المواد ، البند ، طلب شراء ، شراء قسيمة ، المشتري الإيصال، اقتباس، فاتورة المبيعات ، مبيعات BOM ، ترتيب المبيعات ، رقم المسلسل
 DocType: Production Order,Target Warehouse,الهدف مستودع
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع المجموعات تفاصيل
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
 DocType: Salary Manager,Activity Log,سجل النشاط
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
@@ -794,7 +794,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +409,The name of yo
 DocType: HR Settings,Include holidays in Total no. of Working Days,تشمل أيام العطل في المجموع لا. أيام العمل
 DocType: Job Applicant,Hold,عقد
 DocType: Employee,Date of Joining,تاريخ الانضمام
-DocType: Naming Series,Update Series,تحديث سلسلة
+DocType: Naming Series,Update Series,تحديث الرقم المتسلسل
 DocType: Supplier Quotation,Is Subcontracted,وتعاقد من الباطن
 DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,رأي المشتركين
@@ -833,7 +833,7 @@ DocType: Mode of Payment Account,Default Bank / Cash account will be automatical
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,العلامة التجارية
-apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,بدل لأكثر من {0} عبرت القطعة ل{1}.
+apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
 DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
 DocType: Item,Is Purchase Item,هو شراء مادة
 DocType: Payment Reconciliation Payment,Purchase Invoice,فاتورة شراء
@@ -857,7 +857,7 @@ DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ت
 DocType: Pricing Rule,Max Qty,ماكس الكمية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,مادة كيميائية
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,وقد تم بالفعل نقل جميع العناصر لهذا أمر الإنتاج.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 DocType: Salary Manager,Select Payroll Year and Month,حدد الرواتب السنة والشهر
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",انتقل إلى المجموعة المناسبة (عادة طلب تمويل&gt; الأصول الحالية&gt; الحسابات المصرفية وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;البنك&quot;
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
@@ -874,7 +874,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Pi
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 DocType: Workflow State,Stop,توقف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
-DocType: Purchase Order,% of materials billed against this Purchase Order.,٪ من المواد توصف ضد هذا أمر الشراء.
+DocType: Purchase Order,% of materials billed against this Purchase Order.,٪ من المواد فوترت مقابل أمر الشراء هذا.
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},يجب أن يكون النظام نوع واحد من {0}
 DocType: Lead,Next Contact Date,تاريخ لاحق اتصل
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +34,Opening Qty,فتح الكمية
@@ -914,7 +914,7 @@ The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item""
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.
 
-Note: BOM = Bill of Materials","مجموعة مجمعة من عناصر ** ** في البند ** ** آخر. وهذا مفيد إذا كنت تجميع لبعض الأصناف ** ** في حزمة ويمكنك الحفاظ على المخزون من الأصناف ** معبأة ** وليس مجموع المباراتين ** ** البند. 
+Note: BOM = Bill of Materials","مجموعة مجمعة من  ** ** الأصناف  ** ** في ** صنف ** آخر. وهذا مفيد إذا كنت تريد تجميع بعض ** الأصناف ** في حزمة ويمكنك الحفاظ على المخزون من الأصناف ** معبأة ** وليس مجموع المباراتين ** ** البند. 
 
  حزمة ** ** البند سيكون لها ""هل البند الأسهم"" ب ""لا"" و ""هل المبيعات البند"" ب ""نعم"".
 
@@ -931,7 +931,7 @@ apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,سجلا
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Issue,Issue,قضية
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",سمات المتغيرات البند. على سبيل المثال الحجم واللون الخ
+apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +30,WIP Warehouse,مستودع WIP
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
 DocType: BOM Operation,Operation,عملية
@@ -967,13 +967,13 @@ DocType: Supplier,Default Currency,العملة الافتراضية
 DocType: Contact,Enter designation of this Contact,أدخل تسمية هذا الاتصال
 DocType: Contact Us Settings,Address,عنوان
 DocType: Expense Claim,From Employee,من موظف
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} ليس في أي سنة مالية. لمزيد من التفاصيل الاختيار {2}.
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} ليس في أي سنة مالية. لمزيد من التفاصيل اضطلع على {2}.
 apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
 DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
 DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
 DocType: Appraisal Template Goal,Key Performance Area,مفتاح الأداء المنطقة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,نقل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} يجب أن تقدم
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} يجب أن يؤكّد
 DocType: SMS Center,Total Characters,مجموع أحرف
 apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail, تفاصيل الفاتورة نموذج - س 
@@ -1000,7 +1000,7 @@ DocType: Lead,Consultant,مستشار
 DocType: Salary Slip,Earnings,أرباح
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,شيء أن تطلب
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون أكبر من "" تاريخ الانتهاء الفعلي """
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,إدارة
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,أنواع الأنشطة لجداول زمنية
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,الاستثمار الصب
@@ -1011,7 +1011,7 @@ apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,نشط
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,أزرق
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,العقد الإضافية التي يمكن أن تنشأ إلا في ظل العقد نوع ' المجموعة '
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} غ المسلسل صالحة لل تفاصيل {1}
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} أرقام متسلسلة صالحة للصنف {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز المدينة لل رقم التسلسلي
 DocType: Purchase Order Item,UOM Conversion Factor,UOM تحويل عامل
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
@@ -1040,7 +1040,7 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,لم تتم تسو
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
 DocType: Lead,Call,دعوة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,' مقالات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},صف مكررة {0} مع نفسه {1}
 ,Trial Balance,ميزان المراجعة
 sites/assets/js/erpnext.min.js +2,"Grid ""","الشبكة """
@@ -1052,7 +1052,7 @@ DocType: Communication,Sent,أرسلت
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,عرض ليدجر
 DocType: Cost Center,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,"An Item Group exists with same name, please change the item name or rename the item group",وجود فريق المدينة مع نفس الاسم، الرجاء تغيير اسم العنصر أو إعادة تسمية المجموعة البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 DocType: Sales Order,Delivery Status,حالة التسليم
 DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,بقية العالم
@@ -1088,7 +1088,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py
 DocType: Email Digest,New Stock Entries,مقالات جديدة للأسهم
 apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,صغير
-DocType: Employee,Employee Number,عدد الموظفين
+DocType: Employee,Employee Number,رقم الموظف
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 ​​}
 DocType: Material Request,% Completed,٪ مكتمل
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
@@ -1139,7 +1139,7 @@ apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than onc
 DocType: Journal Entry,Journal Entry,إدخال دفتر اليومية
 DocType: Workstation,Workstation Name,اسم محطة العمل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,أرسل دايجست:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى البند {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
 sites/assets/js/desk.min.js +536,Comments,تعليقات
 DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
@@ -1379,18 +1379,18 @@ DocType: Company,Default Payable Account,افتراضي الدائنة حساب
 DocType: Party Type,Contacts,اتصالات
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,الإعداد كاملة
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0} وصفت٪
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0} فوترت٪
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,العلوي الدخل
 apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,قضايا بلدي
-DocType: BOM Item,BOM Item,BOM المدينة
+DocType: BOM Item,BOM Item,BOM صنف
 DocType: Appraisal,For Employee,لموظف
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,صف {0} كمية الدفع لا يمكن أن يكون سلبيا
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,الصحافة المناسب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},ضد فاتورة المورد {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Party Type,Default Price List,قائمة الأسعار الافتراضي
 DocType: Journal Entry,User Remark will be added to Auto Remark,ملاحظة سيتم إضافة مستخدم لملاحظة السيارات
 DocType: Payment Reconciliation,Payments,المدفوعات
@@ -1469,7 +1469,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,رئيسي
 DocType: DocPerm,Delete,حذف
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,مختلف
 sites/assets/js/desk.min.js +836,New {0},جديد {0}
-DocType: Naming Series,Set prefix for numbering series on your transactions,تعيين بادئة لترقيم السلسلة على المعاملات الخاصة بك
+DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
 apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,ترك صرفها؟
@@ -1509,7 +1509,7 @@ DocType: Offer Letter,Rejected,مرفوض
 DocType: Pricing Rule,Brand,علامة تجارية
 DocType: Item,Will also apply for variants,سوف تنطبق أيضا على متغيرات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,سلمت ٪
-apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,حزمة البنود في وقت البيع.
+apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
 DocType: Sales Order Item,Actual Qty,الكمية الفعلية
 DocType: Quality Inspection Reading,Reading 10,قراءة 10
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +560,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
@@ -1575,7 +1575,7 @@ apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were erro
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,نقر
 DocType: Naming Series,Current Value,القيمة الحالية
 apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},قالب البند لا يمكن أن يكون الأسهم وvaraiants. الرجاء إزالة الأوراق المالية من مستودعات {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} خلق
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} تم إنشاء
 DocType: Journal Entry Account,Against Sales Order,ضد ترتيب المبيعات
 ,Serial No Status,المسلسل لا الحالة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
@@ -1628,7 +1628,7 @@ apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,N
 DocType: Communication,Date,تاريخ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,كرر الإيرادات العملاء
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +592,Sit tight while your system is being setup. This may take a few moments.,"الرجاء الانتظار حتى يتم الانتهاء من اعداد النظام, قد يستغرق بضع دقائق."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) يجب أن يكون دور ""النفقات الموافق"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (إعتماد النفقات)
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,زوج
 DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
 DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
@@ -1640,12 +1640,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Embossin
 ,Quotation Trends,اتجاهات الاقتباس
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",كما يمكن أن يتم ترتيب الإنتاج لهذا البند، يجب أن يكون بند الأوراق المالية .
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",لأنه يمكن أن يتم اصدار أمر إنتاج لهذا الصنف، يجب أن يكون الصنف من نوع المخزون .
 DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,انضمام
 DocType: Authorization Rule,Above Value,فوق القيمة
 ,Pending Amount,في انتظار المبلغ
-DocType: Purchase Invoice Item,Conversion Factor,تحويل عامل
+DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
 DocType: Serial No,Delivered,تسليم
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),إعداد ملقم واردة عن وظائف البريد الإلكتروني معرف . (على سبيل المثال jobs@example.com )
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
@@ -1659,7 +1659,7 @@ DocType: Bank Reconciliation,Include Reconciled Entries,وتشمل مقالات
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,شجرة حسابات finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ترك فارغا إذا نظرت لجميع أنواع موظف
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة ""كما البند {1} هو البند الأصول"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة "" لأن الصنف {1} من ضمن الأصول"
 DocType: HR Settings,HR Settings,إعدادات HR
 apps/frappe/frappe/config/setup.py +130,Printing,طبع
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
@@ -1678,7 +1678,7 @@ apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Setting,Price List,قائمة الأسعار
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} الآن الافتراضي السنة المالية. يرجى تحديث المتصفح ل التغيير نافذ المفعول .
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} الآن سنة مالية افتنراضية،  يرجى تحديث المتصفح ل التغيير نافذ المفعول .
 apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,مطالبات حساب
 DocType: Email Digest,Support,دعم
 DocType: Authorization Rule,Approving Role,الموافقة على دور
@@ -1692,7 +1692,7 @@ apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
 DocType: Salary Slip,Deduction,اقتطاع
 DocType: Address Template,Address Template,قالب عنوان
 DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
-DocType: Project,% Tasks Completed,مهام٪ انهوا
+DocType: Project,% Tasks Completed,مهام٪ تم انهاء
 DocType: Project,Gross Margin,هامش الربح الإجمالي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,المستخدم معطل
@@ -1705,7 +1705,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sur
 DocType: Employee,Date of Birth,تاريخ الميلاد
 DocType: Salary Manager,Salary Manager,راتب المدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,البند {0} تم بالفعل عاد
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** يمثل السنة المالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى ضد السنة المالية ** **.
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** يمثل السنة المالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل السنة المالية ** **.
 DocType: Opportunity,Customer / Lead Address,العميل / الرصاص العنوان
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
@@ -1715,7 +1715,7 @@ DocType: Purchase Order Item,Qty as per Stock UOM,حسب الكمية سهم UOM
 apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +34,Please select a valid csv file with data,يرجى تحديد ملف CSV صالحة مع البيانات
 DocType: Features Setup,To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,لتعقب العناصر في المبيعات وثائق الشراء مع NOS دفعة <br> <b>الصناعة المفضل: الكيمياء الخ</b>
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Coating,طلية
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية سلسلة"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار. 
 DocType: Expense Claim,Approver,الموافق
 ,SO Qty,SO الكمية
@@ -1738,14 +1738,14 @@ DocType: Global Defaults,Default Company,افتراضي شركة
 apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة الأسهم الإجمالية
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",لا يمكن overbill ل{0} البند في الصف {1} أكثر من {2}. للسماح بالمغالاة في الفواتير، يرجى ضبط إعدادات في الأوراق المالية
 DocType: Employee,Bank Name,اسم البنك
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-أعلى
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,المستخدم {0} تم تعطيل
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
 DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركه فارغا إذا نظرت لجميع الإدارات
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",أنواع العمل (دائمة أو عقد الخ متدربة ) .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} إلزامي القطعة ل {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Currency Exchange,From Currency,من العملات
 DocType: DocField,Name,اسم
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
@@ -1770,7 +1770,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""Build
 DocType: Quality Inspection,In Process,في عملية
 DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
 DocType: Purchase Receipt,Detailed Breakup of the totals,مفصلة تفكك مجاميع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} ضد ترتيب المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
 DocType: Time Log Batch,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب المستحق
@@ -1830,7 +1830,7 @@ apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Order
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,لحام
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,مطلوب اسهم جديدة UOM
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,وقد تم بالفعل فواتير جميع البنود
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح &#39;من القضية رقم&#39;
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +280,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
@@ -1907,10 +1907,10 @@ apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconcil
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,التلميع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),مصدر الأموال ( المطلوبات )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
-DocType: Appraisal,Employee,عامل
+DocType: Appraisal,Employee,موظف
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,استيراد البريد الإلكتروني من
 DocType: Features Setup,After Sale Installations,بعد التثبيت بيع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} وتوصف بشكل كامل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Workstation Working Hour,End Time,نهاية الوقت
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية ل مبيعات أو شراء .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,المجموعة بواسطة قسيمة
@@ -1937,7 +1937,7 @@ DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,صيانة جد
 DocType: Quality Inspection Reading,Reading 9,قراءة 9
 DocType: Buying Settings,Buying Settings,إعدادات الشراء
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,التشطيب الشامل
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM رقم السلعة جيدة للتشطيب
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,رقم BOM  للأصناف المنتجة
 DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 apps/erpnext/erpnext/config/selling.py +153,Setup incoming server for sales email id. (e.g. sales@example.com),إعداد ملقم البريد الإلكتروني الوارد لل مبيعات الهوية. (على سبيل المثال sales@example.com )
 DocType: Warranty Claim,Raised By,التي أثارها
@@ -1952,7 +1952,7 @@ apps/erpnext/erpnext/setup/doctype/company/company.js +19,Please make sure you r
 DocType: Print Settings,Modern,حديث
 DocType: Communication,Replied,رد
 DocType: Payment Tool,Total Payment Amount,المبلغ الكلي للدفع
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +136,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن يكون أكبر من quanitity والمخططة ({2}) في أمر الإنتاج {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +136,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن تتخطي الكمية المخططة {2} في أمر الانتاج {3}
 DocType: Shipping Rule,Shipping Rule Label,الشحن تسمية القاعدة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
 DocType: Newsletter,Test,اختبار
@@ -1960,7 +1960,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rat
 DocType: Employee,Previous Work Experience,خبرة العمل السابقة
 DocType: Stock Entry,For Quantity,لالكمية
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} لا تقدم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
 apps/erpnext/erpnext/config/stock.py +13,Requests for items.,طلبات البنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 DocType: Email Digest,New Communications,جديد الاتصالات
@@ -2002,7 +2002,7 @@ DocType: Customer,Your Customer's TAX registration numbers (if applicable) or an
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / تاجر / عمولة الوكيل / التابعة / التجزئة الذي يبيع منتجات شركة من أجل عمولة.
 DocType: Customer Group,Has Child Node,وعقدة الطفل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} ضد طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",أدخل المعلمات URL ثابت هنا (مثلا المرسل = ERPNext، اسم المستخدم = ERPNext، كلمة المرور = 1234 الخ)
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,شيخوخة المدى 1
@@ -2394,7 +2394,7 @@ DocType: Expense Claim,"A user with ""Expense Approver"" role","يمكن للم
 DocType: Pricing Rule,Purchase Manager,مدير المشتريات
 DocType: Payment Tool,Payment Tool,دفع أداة
 DocType: Target Detail,Target Detail,الهدف التفاصيل
-DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد توصف ضد هذا أمر المبيعات
+DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد فوترت مقابل أمر المبيعات
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,بدء فترة الإغلاق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
@@ -2406,7 +2406,7 @@ DocType: Purchase Receipt,LR Date,LR تاريخ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
 DocType: GL Entry,Voucher No,رقم السند
 DocType: Leave Allocation,Leave Allocation,ترك توزيع
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,""" الأسهم تحديث ' ل فاتورة المبيعات {0} يجب تعيين"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,""" تحديث المخزون' ل فاتورة المبيعات {0} يجب إدخاله"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,طلبات المواد {0} خلق
 apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,قالب من الشروط أو العقد.
 DocType: Employee,Feedback,تعليقات
@@ -2464,7 +2464,7 @@ DocType: Payment Tool,Against Vouchers,ضد قسائم
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,مساعدة سريعة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
 DocType: Features Setup,Sales Extras,مبيعات إضافات
-apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} ضد مركز التكلفة {2} سيتجاوز التي كتبها {3}
+apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
 DocType: Leave Allocation,Carry Forwarded Leaves,تحمل أوراق واحال
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
@@ -2477,14 +2477,14 @@ DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسو
 DocType: Backup Manager,Upload Backups to Dropbox,تحميل النسخ الاحتياطي إلى دروببوإكس
 ,Qty to Receive,الكمية لاستقبال
 DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,عامل التحويل لا يمكن أن يكون في الكسور
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,معامل التحويل لا يمكن أن يكون في الكسور
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,سوف استخدامه لتسجيل الدخول
 DocType: Sales Partner,Retailer,متاجر التجزئة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع مزود
 apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
-DocType: Sales Order,%  Delivered,ألقيت٪
+DocType: Sales Order,%  Delivered,تم إيصاله٪
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,جعل زلة الراتب
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,نزع السدادة
@@ -2553,7 +2553,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,ال
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
 DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} تم إدخال أكثر من مرة واحدة في البند المتغيرات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} تم إدخال أكثر من مرة واحدة في أنواع الصنف الجدول
 ,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},المسلسل لا {0} لا ينتمي إلى مستودع {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Note: Reference Date exceeds allowed credit days by {0} days for {1} {2},ملاحظة: مرجع التسجيل يتجاوز أيام الائتمان المسموح به من قبل {0} يوما ل{1} {2}
@@ -2581,7 +2581,7 @@ DocType: Email Digest,Expenses booked for the digest period,نفقات حجزه
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,على سبيل المثال ضريبة
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
 DocType: Shopping Cart Settings,Quotation Series,اقتباس السلسلة
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",عنصر موجود مع نفس الاسم ( {0} ) ، الرجاء تغيير اسم المجموعة البند أو إعادة تسمية هذا البند
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,الغاز المعدن الساخن تشكيل
 DocType: Sales Order Item,Sales Order Date,مبيعات الترتيب التاريخ
 DocType: Sales Invoice Item,Delivered Qty,تسليم الكمية
@@ -2650,7 +2650,7 @@ DocType: Sales Invoice Item,Delivery Note Item,ملاحظة تسليم السل
 DocType: Expense Claim,Task,مهمة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Shaving,حلق
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع صف #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},رقم الدفعة إلزامي القطعة ل{0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},رقم الباتش إلزامي للصنف{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
 ,Stock Ledger,الأسهم ليدجر
 DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
@@ -2697,7 +2697,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Please enter
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",قائمة رؤساء الضريبية الخاصة بك (على سبيل المثال ضريبة القيمة المضافة، الضرائب ، بل ينبغي لها أسماء فريدة من نوعها ) و معدلاتها القياسية.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة لل تفاصيل {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ملاحظة: إذا لم يتم الدفع ضد أي إشارة، وجعل الدخول مجلة يدويا.
 DocType: Item,Supplier Items,المورد الأصناف
@@ -2749,7 +2749,7 @@ DocType: Notification Control,Custom Message,رسالة مخصصة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,الخدمات المصرفية الاستثمارية
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency",اختر بلدك، المنطقة الزمنية والعملات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} هو الوضع تتفتح
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} الوضع (غير متوقف)
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,تخليل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,صب الرمل
@@ -2810,7 +2810,7 @@ DocType: Journal Entry,Print Heading,طباعة عنوان
 DocType: Quotation,Maintenance Manager,مدير الصيانة
 DocType: Workflow State,Search,البحث
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,إجمالي لا يمكن أن يكون صفرا
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,"""أيام منذ بالدفع آخر "" يجب أن تكون أكبر من أو تساوي الصفر"
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,"""عدد الأيام منذ آخر طلب "" يجب أن تكون أكبر من أو تساوي الصفر"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,مختلط
 DocType: C-Form,Amended From,عدل من
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,المواد الخام
@@ -2849,7 +2849,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transf
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,إنشاء اقتباس
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,وقد تم بالفعل فاتورة كل هذه العناصر
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن أن يكون وافق عليها {0}
 DocType: Shipping Rule,Shipping Rule Conditions,الشحن شروط القاعدة
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
@@ -2867,7 +2867,7 @@ apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipien
 DocType: Features Setup,Item Groups in Details,المجموعات في البند تفاصيل
 apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,حساب المصاريف إلزامي
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),بداية في نقاط البيع (POS)
-DocType: Item,A new variant (Item) will be created for each attribute value combination,سيتم إنشاء متغير جديد (بند) لكل مجموعة قيمة السمة
+DocType: Item,A new variant (Item) will be created for each attribute value combination,سيتم إنشاء متغير جديد (صنف) لكل مجموعة قيمة 
 apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,تقرير زيارة للدعوة الصيانة.
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,النسبة المئوية يسمح لك لتلقي أو تقديم المزيد من ضد الكمية المطلوبة. على سبيل المثال: إذا كنت قد أمرت 100 وحدة. و10٪ ثم يسمح بدل الخاص بك لتلقي 110 وحدة.
 DocType: Pricing Rule,Customer Group,مجموعة العملاء
@@ -2912,7 +2912,7 @@ DocType: ToDo,Reference,مرجع
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,تثقيب
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,من الكمية
 apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,سلسلة إلزامي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,الترقيم المتسلسل إلزامي
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,الخدمات المالية
 DocType: Opportunity,Sales,مبيعات
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
@@ -2925,7 +2925,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +567,Fet
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,تلبد
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
-DocType: Naming Series,Setup Series,سلسلة الإعداد
+DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
 DocType: Supplier,Contact HTML,الاتصال HTML
 DocType: Landed Cost Voucher,Purchase Receipts,إيصالات شراء
 DocType: Payment Reconciliation,Maximum Amount,أقصى مبلغ
@@ -2961,13 +2961,13 @@ DocType: Serial No,Creation Time,إنشاء الموضوع
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,إجمالي الإيرادات
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,العثور على أي سجل
-apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي القطعة ل{2}
+apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,حساب {0} غير نشط
 DocType: GL Entry,Is Advance,هو المقدمة
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,الحضور من التسجيل والحضور إلى تاريخ إلزامي
 apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"الربح و الخسارة "" نوع الحساب {0} غير مسموح به في افتتاح الدخول"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
 DocType: Workflow State,Time,مرة
 DocType: Features Setup,Sales Discounts,مبيعات خصومات
 DocType: Hub Settings,Seller Country,البائع البلد
@@ -2983,7 +2983,7 @@ DocType: Shipping Rule,Specify conditions to calculate shipping amount,تحدي
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,إضافة الطفل
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,دور السماح للتعيين الحسابات المجمدة وتحرير مقالات المجمدة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى دفتر الأستاذ كما فعلت العقد التابعة
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,مطلوب عامل التحويل
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,مطلوب معامل التحويل
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +32,Serial #,المسلسل #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,عمولة على المبيعات
 DocType: Offer Letter Term,Value / Description,قيمة / الوصف
@@ -3004,7 +3004,7 @@ DocType: Sales Invoice,Posting Time,نشر التوقيت
 DocType: Sales Order,% Amount Billed,المبلغ٪ صفت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,مصاريف الهاتف
 DocType: Sales Partner,Logo,شعار
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} الأرقام التسلسلية المطلوبة القطعة ل {0} . فقط {0} المقدمة.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} الأرقام التسلسلية المطلوبة للصنف {0} . فقط {0} المقدمة.
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,التحقق من ذلك إذا كنت تريد لإجبار المستخدم لتحديد سلسلة قبل الحفظ. لن يكون هناك الافتراضي إذا قمت بتحديد هذا.
 apps/erpnext/erpnext/stock/get_item_details.py +108,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,المصاريف المباشرة
@@ -3081,8 +3081,8 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند
 DocType: Purchase Order Item,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,الكي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} غير توقف
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} لم يتوقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},الباركود {0} تستخدم بالفعل في البند {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مطلوب العملاء
@@ -3105,7 +3105,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Selli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
 DocType: BOM Replace Tool,Replace,استبدل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} ضد فاتورة المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
 DocType: Purchase Invoice Item,Project Name,اسم المشروع
 DocType: Workflow State,Edit,تحرير
@@ -3168,7 +3168,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,C
 DocType: Batch,Batch ID,دفعة ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون البند شراؤها أو التعاقد الفرعي في الصف {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
 DocType: GL Entry,Party,الطرف
 DocType: Sales Order,Delivery Date,تاريخ التسليم
@@ -3192,7 +3192,7 @@ DocType: SMS Settings,SMS Settings,SMS إعدادات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,حسابات مؤقتة
 DocType: Payment Tool,Column Break 1,استراحة العمود 1
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,أسود
-DocType: BOM Explosion Item,BOM Explosion Item,BOM انفجار الإغلاق
+DocType: BOM Explosion Item,BOM Explosion Item,BOM  Explosion Item
 DocType: Account,Auditor,مدقق حسابات
 DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
@@ -3208,7 +3208,7 @@ DocType: Purchase Invoice,Exchange Rate,سعر الصرف
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,تشطيب المغزل
-DocType: Material Request,% of materials ordered against this Material Request,٪ من المواد المطلوبة ضد هذه المادة طلب
+DocType: Material Request,% of materials ordered against this Material Request,٪ من المواد طلبت مقابل أمر التزويد
 DocType: BOM,Last Purchase Rate,أخر سعر توريد
 DocType: Account,Asset,الأصول
 DocType: Project Task,Task ID,ID مهمة
@@ -3220,7 +3220,7 @@ apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} doe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,سجل للحصول على ERPNext المحور
 DocType: Monthly Distribution,Monthly Distribution Percentages,النسب المئوية لتوزيع الشهرية
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
-DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة ضد هذا التسليم ملاحظة
+DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة  سلمت من أمر التوصيل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stapling,التدبيس
 DocType: Customer,Customer Details,تفاصيل العملاء
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Shaping,تشكيل
@@ -3228,7 +3228,7 @@ DocType: Employee,Reports to,تقارير إلى
 DocType: SMS Settings,Enter url parameter for receiver nos,أدخل عنوان URL لمعلمة NOS استقبال
 DocType: Sales Invoice,Paid Amount,المبلغ المدفوع
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',إغلاق الحساب {0} يجب أن تكون من النوع ' المسؤولية '
-,Available Stock for Packing Items,الأسهم المتاحة للتعبئة وحدات
+,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Reserved Warehouse is missing in Sales Order,المحجوزة مستودع مفقود في ترتيب المبيعات
 DocType: Item Variant,Item Variant,البديل البند
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
@@ -3276,9 +3276,9 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,عقدة المجموعة
 DocType: Payment Reconciliation,Minimum Amount,الحد الأدنى المبلغ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,تحديث السلع منتهية
-DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",ضبط تلقائيا. إذا كان هذا البند لديها بدائل، ثم فإنه لا يمكن تحديدها في أوامر البيع الخ
+DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",ضبط تلقائيا. إذا كان هذا الصنف لديه بدائل، ثم فإنه لا يمكن تحديدها في أوامر البيع الخ
 DocType: Workstation,per hour,كل ساعة
-apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},سلسلة {0} تستخدم بالفعل في {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},الترقيم المتسلسل {0} مستخدم بالفعل في {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
@@ -3374,7 +3374,7 @@ DocType: BOM,Manufacturing User,التصنيع العضو
 DocType: Purchase Order,Raw Materials Supplied,المواد الخام الموردة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +239,Total valuation ({0}) for manufactured or repacked item(s) can not be less than total valuation of raw materials ({1}),التقييم الإجمالي ({0}) لتصنيعها أو إعادة تعبئتها البند (ق) لا يمكن أن يكون أقل من التقييم الكلي للمواد الخام ({1})
 DocType: Email Digest,New Projects,مشاريع جديدة
-DocType: Communication,Series,سلسلة
+DocType: Communication,Series,سلسلة ترقيم الوثيقة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ طلب شراء
 DocType: Appraisal,Appraisal Template,تقييم قالب
 DocType: Communication,Email,البريد الإلكتروني
@@ -3420,12 +3420,12 @@ DocType: Salary Slip Deduction,Default Amount,المبلغ الافتراضي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,لم يتم العثور على مستودع في النظام
 DocType: Quality Inspection Reading,Quality Inspection Reading,جودة التفتيش القراءة
 DocType: Party Account,col_break1,col_break1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد الأرصدة أقدم من يجب أن يكون أصغر من ٪ d يوم ` .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 ,Project wise Stock Tracking,مشروع تتبع حركة الأسهم الحكمة
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},جدول الصيانة {0} موجود ضد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),الكمية الفعلية (في المصدر / الهدف)
 DocType: Item Customer Detail,Ref Code,الرمز المرجعي لل
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,موظف السجلات.
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,سجلات الموظفين
 DocType: HR Settings,Payroll Settings,إعدادات الرواتب
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
 DocType: Email Digest,New Purchase Orders,أوامر الشراء الجديدة
@@ -3455,7 +3455,7 @@ DocType: Backup Manager,Weekly,الأسبوعية
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
 DocType: Maintenance Visit,Fully Completed,يكتمل
 DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.",سيتم فرز المنتجات حسب العمر، الوزن في عمليات البحث الافتراضي. أكثر من الوزن في سن، وأعلى المنتج تظهر في القائمة.
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ كاملة
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
@@ -3512,7 +3512,7 @@ apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
 DocType: Naming Series,Help HTML,مساعدة HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
-apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},بدل لأكثر من {0} عبرت القطعة ل{1}
+apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
 DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,لديك موردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
@@ -3537,7 +3537,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it d
 DocType: Delivery Note,To Warehouse,لمستودع
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},تم إدخال حساب {0} أكثر من مرة للعام المالي {1}
 ,Average Commission Rate,متوسط ​​العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"' ليس لديه المسلسل "" لا يمكن أن يكون "" نعم "" ل عدم الأسهم البند"
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"' لا يحوي رقم متسلسل "" لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات التسعير القاعدة
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
@@ -3571,7 +3571,7 @@ DocType: Authorization Rule,Based On,وبناء على
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,توليد قسائم راتب
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} ليس معرف بريد إلكتروني صحيح
+apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} بريد إلكتروني غير صحيح
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
 DocType: ToDo,Low,منخفض
@@ -3631,7 +3631,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expe
 DocType: Contact Us Settings,City,مدينة
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,بالموجات فوق الصوتية بالقطع
 apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
-DocType: Naming Series,Update Series Number,تحديث سلسلة رقم
+DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
 DocType: Account,Equity,إنصاف
 DocType: Task,Closing Date,تاريخ الإنتهاء
 DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
@@ -3639,7 +3639,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +79,Engineer,م
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 ​​}
 DocType: Sales Partner,Partner Type,نوع الشريك
 DocType: Purchase Taxes and Charges,Actual,فعلي
-DocType: Purchase Order,% of materials received against this Purchase Order,تلقى٪ من المواد ضد هذا أمر الشراء
+DocType: Purchase Order,% of materials received against this Purchase Order,تلقى٪ من المواد مقابل أمر الشراء
 DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
 DocType: Purchase Invoice,Against Expense Account,ضد حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
@@ -3655,7 +3655,7 @@ sites/assets/js/list.min.js +160,Gantt Chart,مخطط جانت
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,سلسلة تحديث
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,تم تحديث الرقم المتسلسل
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Report Type is mandatory,تقرير نوع إلزامي
 DocType: Item,Serial Number Series,المسلسل عدد سلسلة
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
@@ -3684,7 +3684,7 @@ DocType: DocPerm,Level,مستوى
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""التبليغ عناوين"" غير محددة لالمتكررة٪ الصورة"
+apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,طحن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,القضم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
@@ -3706,7 +3706,7 @@ DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,إظهار القيم الصفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
-DocType: Delivery Note Item,Against Sales Order Item,ضد ترتيب المبيعات البند
+DocType: Delivery Note Item,Against Sales Order Item,مقابل المبيعات 
 DocType: Item,Default Warehouse,النماذج الافتراضية
 DocType: Task,Actual End Date (via Time Logs),الفعلي تاريخ الانتهاء (عبر الزمن سجلات)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأصل
@@ -3744,7 +3744,7 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,الحفاظ على نفس المعدل خلال دورة المبيعات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},لا يمكن أن يعود أكثر من {0} القطعة ل {1}
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات العمل محطة العمل.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} وقد تم بالفعل قدمت
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} قد تم بالفعل تأكيده
 ,Items To Be Requested,البنود يمكن طلبه
 DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Company,Company Info,معلومات عن الشركة
@@ -3758,7 +3758,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
 DocType: Purchase Common,Purchase Common,شراء المشتركة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} تم تعديل . يرجى تحديث.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من إجراء تطبيقات على إجازة الأيام التالية.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,من الفرص
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,تقطيع
@@ -3771,7 +3771,7 @@ apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,رفعت
 DocType: DocField,Default,الافتراضي
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
 DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",واختيار &quot;نعم&quot; السماح لهذا البند يظهر في أمر الشراء، وتلقي شراء.
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,وأضاف {0} المشتركين
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0}  مشتركين تم اضافتهم
 DocType: Maintenance Schedule,Schedule,جدول
 DocType: Account,Parent Account,الأصل حساب
 DocType: Serial No,Available,متاح
@@ -3813,7 +3813,7 @@ DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مس
 DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
 DocType: Production Order,Actual Start Date,تاريخ البدء الفعلي
-DocType: Sales Order,% of materials delivered against this Sales Order,٪ من المواد الموردة ضد هذا أمر المبيعات
+DocType: Sales Order,% of materials delivered against this Sales Order,٪ من المواد الموردة أوصلت مقابل أمر المبيعات
 apps/erpnext/erpnext/config/stock.py +18,Record item movement.,تسجيل حركة البند.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,قائمة النشرة المشترك
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Morticing

erpnext/translations/es.csv

@@ -30,7 +30,7 @@ apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0
 DocType: Job Applicant,Job Applicant,solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Impuesto de tipo real no puede ser incluido en el precio del artículo en la fila {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},La tarifa actual no puede ser incluida en el precio del artículo en la fila {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Requerido por
 DocType: Department,Department,Departamento
@@ -77,13 +77,13 @@ sites/assets/js/erpnext.min.js +50,Please select Price List,"Por favor, seleccio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
 DocType: Company,If Monthly Budget Exceeded,Si Presupuesto mensual excedido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,La impresión 3D
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impresión 3D
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Hora de registro
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Contador
 DocType: Company,Phone No,Teléfono No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bitácora de actividades realizadas por los usuarios frente a las tareas que se pueden utilizar para el tiempo de seguimiento, facturación."
-apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nueva {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nuevo {0}: # {1}
 ,Sales Partners Commission,Comisión del Socio de Ventas
 apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Backup Manager,Allow Google Drive Access,Permitir Acceso a Google Drive
@@ -120,7 +120,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not auth
 apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,El Artículo Principal {0} no debe ser un elemento en Stock y debe ser un Artículo para Venta
 DocType: Item,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Tiempo real de la Operación
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la Operación
 DocType: SMS Log,SMS Log,SMS Iniciar sesión
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo del Material que se adjunta
 DocType: Blog Post,Guest,Invitado
@@ -153,7 +153,7 @@ DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
 DocType: Naming Series,Prefix,Prefijo
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,Consumible
-DocType: Upload Attendance,Import Log,Importar registro
+DocType: Upload Attendance,Import Log,Importar Registro
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: SMS Center,All Contact,Todos los Contactos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Salario Anual
@@ -221,7 +221,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} does
 DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
 apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},Almacén Reservado requerido para la acción del artículo {0} en la fila {1}
 DocType: Sales Invoice,Is Opening Entry,Es la entrada de apertura
-DocType: Supplier,Mention if non-standard receivable account applicable,Mencione si cuenta por cobrar no estándar aplicable
+DocType: Supplier,Mention if non-standard receivable account applicable,Mencione si cuenta por cobrar no estándar es  aplicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,Para se requiere antes de Almacén Enviar
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,Por favor introduzca Company
@@ -291,7 +291,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,Max 5 characte
 DocType: Email Digest,New Quotations,Nuevas Citas
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +194,Select Your Language,Seleccione su idioma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
-DocType: Accounts Settings,Settings for Accounts,Ajustes de Cuentas
+DocType: Accounts Settings,Settings for Accounts,Ajustes de Contabilidad
 apps/erpnext/erpnext/config/crm.py +80,Manage Sales Person Tree.,Administrar Árbol de Personal de Ventas.
 DocType: Item,Synced With Hub,Sincronizado con Hub
 DocType: Item,Variant Of,Variante de
@@ -303,7 +303,7 @@ DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inven
 DocType: Period Closing Voucher,Closing Account Head,Cierre Cuenta Principal
 DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer grupo""> Añadir / Editar < / a>"
 DocType: Employee,External Work History,Historial de trabajo externo
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referencia Circular Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error Referencia Circular
 DocType: ToDo,Closed,Cerrado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Export ) será visible una vez que guarde la nota de entrega .
 DocType: Lead,Industry,Industria
@@ -360,15 +360,15 @@ DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Artículo Calidad de parámetros de Inspección
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del Articulo 
 DocType: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
 ,Schedule Date,Horario Fecha
 DocType: Packed Item,Packed Item,Artículo Empacado
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Ajustes por defecto para de las transacciones de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Existe Costo Actividad de Empleado {0} contra el Tipo de Actividad - {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, no crear cuentas de clientes y proveedores. Se crean directamente de los maestros al cliente / proveedor."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, NO crear cuentas de clientes y proveedores. Se crean directamente de los maestros de clientes/proveedores."
 DocType: Currency Exchange,Currency Exchange,Cambio de Divisas
-DocType: Purchase Invoice Item,Item Name,Nombre del elemento
+DocType: Purchase Invoice Item,Item Name,Nombre del Articulo
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
 DocType: Employee,Widowed,Viudo
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados ​​en Cantidad proyectada y pedido mínimo Cantidad"
@@ -428,7 +428,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
 DocType: Packing Slip,From Package No.,Del Paquete N º 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y Depósitos
 DocType: Features Setup,Imports,Importaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,La unión adhesiva
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,Union adhesiva
 DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de Asistencia .
 DocType: Bank Reconciliation,Journal Entries,Comprobantes de Diario
@@ -461,7 +461,7 @@ apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To merge, following proper
 DocType: Backup Manager,Email ids separated by commas.,ID de correos electrónicos separados por comas.
 DocType: Communication,Subject,Sujeto
 DocType: Item,"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Seleccione "" Sí"" si este artículo representa un poco de trabajo al igual que la formación, el diseño, consultoría , etc"
-DocType: Shipping Rule,Net Weight,Peso neto
+DocType: Shipping Rule,Net Weight,Peso Neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
 DocType: Backup Manager,Google Drive Access Allowed,Google Drive Acceso Permitido
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
@@ -569,7 +569,7 @@ DocType: Sales Person,Sales Person Targets,Metas de Vendedor
 sites/assets/js/form.min.js +253,To,a
 apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,End tube forming,Fin tubo formando
-DocType: Production Order Operation,In minutes,En cuestión de minutos
+DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de Resolución
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, ajuste de cuenta bancaria Efectivo por defecto o en el modo de pago {0}"
 DocType: Selling Settings,Customer Naming By,Naming Cliente Por
@@ -602,7 +602,7 @@ DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
 DocType: Sales Order Item,Basic Rate (Company Currency),Tarifa Base (Moneda Local)
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,Por favor ingrese los detalles del artículo
 DocType: Purchase Receipt,Other Details,Otros Datos
-DocType: Account,Accounts,Cuentas
+DocType: Account,Accounts,Contabilidad
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,Marketing
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Straight shearing,Esquila Heterosexual
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
@@ -750,10 +750,10 @@ DocType: Maintenance Visit,Completion Status,Estado de Finalización
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Para realizar el seguimiento de marca en el siguiente documento Nota de entrega , Oportunidad , solicitud de material , artículo , Orden de Compra, Comprar Bono , el recibo de compra , cotización , factura de venta , lista de materiales de ventas , órdenes de venta , Número de Serie"
 DocType: Production Order,Target Warehouse,Inventario Objetivo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,Fecha prevista de entrega no puede ser anterior Fecha de órdenes de venta
-DocType: Upload Attendance,Import Attendance,Asistente de importación
+DocType: Upload Attendance,Import Attendance,Asistente de Importación
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Salary Manager,Activity Log,Registro de Actividad
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad Neta / Pérdida
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neta / Pérdida Utilidad
 apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,Fundición de molde permanente
@@ -857,7 +857,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,Químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Salary Manager,Select Payroll Year and Month,Seleccione nómina Año y Mes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir al grupo apropiado (generalmente Aplicación de Fondos&gt; Activo Circulante&gt; Cuentas Bancarias y crear una nueva cuenta (haciendo clic en Añadir niño) de tipo &quot;Banco&quot;
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado (generalmente Aplicación de Fondos> Activo Circulante> Cuentas Bancarias y crear una nueva cuenta (haciendo clic en Añadir hijo) de tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Coste de electricidad
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envíe Empleado Birthday Reminders
 DocType: Comment,Unsubscribed,No Suscrito
@@ -940,7 +940,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
-DocType: Sales Partner,Implementation Partner,socio de implementación
+DocType: Sales Partner,Implementation Partner,Socio de Implementación
 DocType: Purchase Invoice,Contact Info,Información de Contacto
 DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Make Purchase Receipt,Hacer recibo de compra
@@ -993,7 +993,7 @@ apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear Oportunidad
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
 DocType: Supplier,Communications,Comunicaciones
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Planificación de la capacidad de error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Error en la Planificación de la Capacidad
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
@@ -1010,7 +1010,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Azul
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo  ' Grupo '
 DocType: Item,UOMs,Unidades de Medida
 apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} No Serie válidos para el elemento {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Código del artículo no se puede cambiar de número de serie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Código del Artículo no se puede cambiar de Número de Serie
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Laminated object manufacturing,Fabricación de objetos laminado
@@ -1019,13 +1019,13 @@ DocType: Account,Balance Sheet,Hoja de Balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +596,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Stretch forming,Formando Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +203,"Further accounts can be made under Groups, but entries can be made against non-Groups","Otras cuentas se pueden hacer en Grupos, pero las entradas se pueden hacer contra los no Grupos"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +203,"Further accounts can be made under Groups, but entries can be made against non-Groups","Otras cuentas se pueden organizar dentro de Grupos, pero las entradas solò se pueden hacer contra los que no son de Grupo"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por Pagar
 DocType: Account,Warehouse,Almacén
 ,Purchase Order Items To Be Billed,Artículos de Orden de Compra a Facturar
-DocType: Purchase Invoice Item,Net Rate,Tasa neta
+DocType: Purchase Invoice Item,Net Rate,Tasa Neta
 DocType: Backup Manager,Database Folder ID,Base de Datos de Identificación de carpetas
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
@@ -1058,7 +1058,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,
 ,Budget Variance Report,Informe de  Varianza en el Presupuesto 
 DocType: Salary Slip,Gross Pay,Pago bruto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagados
-DocType: Stock Reconciliation,Difference Amount,Diferencia Monto
+DocType: Stock Reconciliation,Difference Amount,Diferencia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Ganancias Retenidas
 DocType: Purchase Order,Required raw materials issued to the supplier for producing a sub - contracted item.,Las materias primas necesarias emitidas al proveedor para la producción de un ítem sub - contratado .
 DocType: BOM Item,Item Description,Descripción del Artículo
@@ -1110,8 +1110,8 @@ sites/assets/js/form.min.js +180,Name is required,El nombre es necesario
 DocType: Purchase Invoice,Recurring Type,Tipo Recurrente
 DocType: Address,City/Town,Ciudad/Provincia
 DocType: Serial No,Serial No Details,Serial No Detalles
-DocType: Purchase Invoice Item,Item Tax Rate,Tasa de Impuesto del artículo
+DocType: Purchase Invoice Item,Item Tax Rate,Tasa de Impuesto del Artículo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, sólo las cuentas de crédito se pueden vincular con otro asiento de débito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con otro asiento de débito"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/stock/get_item_details.py +137,Item {0} must be a Sub-contracted Item,Artículo {0} debe ser un artículo subcontratada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipos de Capitales
@@ -1126,7 +1126,7 @@ DocType: Purchase Invoice,Grand Total (Company Currency),Total General (Moneda L
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +42,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
 DocType: DocType,Transaction,Transacción
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden hacer asientos contables en contra de grupos.
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un Grupo. No se pueden hacer asientos contables en contra de Grupos.
 apps/erpnext/erpnext/config/projects.py +43,Tools,Herramientas
 DocType: Sales Taxes and Charges Template,Valid For Territories,Válido para Territorios
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
@@ -1252,7 +1252,7 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Source wareho
 DocType: Packing Slip,Packing Slip,El resbalón de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
 apps/erpnext/erpnext/config/setup.py +80,Setup SMS gateway settings,Configuración de puerta de enlace de configuración de SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,Import Error !
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,¡Importación  Fallida!
 sites/assets/js/erpnext.min.js +19,No address added yet.,No se ha añadido ninguna dirección todavía.
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Analista
@@ -1292,7 +1292,7 @@ DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Número de Detalle en la Solicitud de Materiales
 DocType: Period Closing Voucher,CoA Help,CoA Ayuda
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +533,Error: {0} > {1},Error: {0} > {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta de Plan General de Contabilidad ."
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo de Clientes> Territorio
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lote Cantidad en almacén
@@ -1344,8 +1344,8 @@ DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
 DocType: Production Planning Tool,Select Sales Orders,Selección de órdenes de venta
 ,Material Requests for which Supplier Quotations are not created,Las Solicitudes de Material para los que no se crearon Cotizaciones del Proveedor
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hacer Cita
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hacer Proforma
-DocType: Dependent Task,Dependent Task,Tarea dependiente
+DocType: Dependent Task,Dependent Task,Tarea Dependiente
 apps/erpnext/erpnext/stock/doctype/item/item.py +291,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversión de unidad de medida predeterminada debe ser de 1 en la fila {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +193,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 Entrega""  y ""No de Factura"". Por favor ingrese cualquiera ."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
@@ -1377,7 +1377,7 @@ DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
 DocType: Party Type,Contacts,Contactos
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,Configuración completa
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Anunciado
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta de la Partida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Recursos Humanos
@@ -1399,7 +1399,7 @@ DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 DocType: Quotation,Term Details,Detalles de los Terminos
-DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de la capacidad para (Días)
+DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de la Capacidad para (Días)
 DocType: Warranty Claim,Warranty Claim,Reclamación de la Garantía
 ,Lead Details,Detalle de la Iniciativa
 DocType: Authorization Rule,Approving User,Aprobar Usuario
@@ -1420,12 +1420,12 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir Deducción por Licencia sin Sueldo ( LWP )
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Selling Settings,Selling Settings,Configuración de Ventas 
-apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,El artículo no puede ser una variante de una variante
+apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,El Artículo no puede ser una variante de una variante
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Online Auctions,Subastas en Línea
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Please specify either Quantity or Valuation Rate or both,Por favor especificar Cantidad o valoración de tipo o ambos
 apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +36,"Company, Month and Fiscal Year is mandatory","Empresa, Mes y Año Fiscal es obligatorio"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Gastos de Comercialización
-,Item Shortage Report,Reportar escasez del artículo
+,Item Shortage Report,Reportar Escasez del Artículo
 apps/erpnext/erpnext/stock/doctype/item/item.js +208,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 DocType: Journal Entry,View Details,Ver detalles
@@ -1451,7 +1451,7 @@ DocType: Lead,Next Contact By,Siguiente Contacto por
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Quantity required for Item {0} in row {1},Cantidad requerida para el punto {0} en la fila {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
 DocType: Quotation,Order Type,Tipo de Orden
-DocType: Purchase Invoice,Notification Email Address,Email de notificación
+DocType: Purchase Invoice,Notification Email Address,Correo Electronico de Notificación
 DocType: Payment Tool,Find Invoices to Match,Encuentra facturas para que coincida
 ,Item-wise Sales Register,- Artículo sabio ventas Registrarse
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
@@ -1466,7 +1466,7 @@ DocType: Sales Invoice Item,Batch No,Lote Nro
 apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Principal
 DocType: DocPerm,Delete,Eliminar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +836,New {0},Nueva {0}
+sites/assets/js/desk.min.js +836,New {0},Nuevo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establecer prefijo de numeración de serie en sus transacciones
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
 apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,Por defecto la lista de materiales ({0}) debe estar activo para este material o su plantilla
@@ -1521,7 +1521,7 @@ apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
 DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Fecha de Emisión
-DocType: Activity Cost,Activity Cost,Costo Actividad
+DocType: Activity Cost,Activity Cost,Costo de Actividad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad Consumida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borrador)
@@ -1554,7 +1554,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,"Payme
  Monto Remanente {2}"
 DocType: Backup Manager,Dropbox Access Secret,Acceso Secreto de Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrente
-DocType: Item,Net Weight of each Item,Peso neto de cada artículo
+DocType: Item,Net Weight of each Item,Peso Neto de cada Artículo
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 DocType: Budget Detail,Fiscal Year,Año Fiscal
 DocType: Cost Center,Budget,Presupuesto
@@ -1815,7 +1815,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,C
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +236,BOM recursion: {0} cannot be parent or child of {2},Recursividad de Solicitud de Materiales: {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,"Cantidad Completada
 "
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, sólo las cuentas de débito pueden ser enlazados con otra entrada de crédito"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden ser enlazados con otra entrada de crédito"
 apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,Lista de precios {0} está deshabilitado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
 apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,Orden de Venta {0} esta detenida
@@ -1907,7 +1907,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Cantidad en la fila {0} ({1} ) debe ser la misma que la cantidad fabricada {2}
 DocType: Appraisal,Employee,Empleado
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importación de correo electrónico De
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar Correo Electrónico de:
 DocType: Features Setup,After Sale Installations,Instalaciones Post Venta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de Finalización
@@ -2050,7 +2050,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 DocType: Note,Note,nota
 DocType: Email Digest,New Material Requests,Nueva Solicitud de Material
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
-DocType: Email Account,Email Ids,Email Ids
+DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,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}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,Establecer como destapados
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
@@ -2120,7 +2120,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flatteni
 apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,Respaldos serán subidos a
 DocType: Account,Income Account,Cuenta de Ingresos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,Moldura
-DocType: Stock Reconciliation Item,Current Qty,Cantidad actual
+DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte "" Cambio de materiales a base On"" en la sección Cálculo del coste"
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
@@ -2170,7 +2170,7 @@ DocType: Payment Tool Detail,Payment Tool Detail,Detalle Herramienta Pago
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,local
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +142,Large,Grande
@@ -2196,8 +2196,8 @@ apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +162,Please create C
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadoras
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Electro-chemical grinding,Electro-química de molienda
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Se trata de un grupo de clientes raíz y no se puede editar .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los comentarios de Contabilidad"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los Registros de Contabilidad"
-DocType: Purchase Invoice,Ignore Pricing Rule,No haga caso de la Regla Precios
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la Regla Precios
 sites/assets/js/list.min.js +23,Cancelled,Cancelado
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear Días
@@ -2260,8 +2260,8 @@ DocType: Purchase Order Item,Material Request No,Nº de Solicitud de Material
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
 DocType: Purchase Invoice,Discount Amount (Company Currency),Importe del Descuento (Moneda Local)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} ha sido éxito de baja de esta lista.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Compañía moneda)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa Neta (Moneda Local)
 apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Administrar Árbol de Territorio.
 DocType: Payment Reconciliation Payment,Sales Invoice,Factura de Venta
 DocType: Journal Entry Account,Party Balance,Equilibrio Partido
@@ -2294,7 +2294,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Extra Smal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,Rocíe la formación
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,Cuenta {0} está congelada
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un gráfico separado de cuentas que pertenecen a la Organización.
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 apps/erpnext/erpnext/config/setup.py +116,Address master.,Dirección Principal.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
@@ -2480,7 +2480,7 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,detallista
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los Tipos de proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,Código del artículo es obligatorio porque El artículo no se numera automáticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,Código del Artículo es obligatorio porque el Artículo no se enumera automáticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
@@ -2488,7 +2488,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Continuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
-apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignoreado:
+apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignorado:
 apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} no se puede comprar con el carrito
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo inicial Equidad
@@ -2509,7 +2509,7 @@ DocType: Production Plan Sales Order,SO Date,SO Fecha
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Compañía moneda)
 DocType: BOM Operation,Hour Rate,Hora de Cambio
-DocType: Stock Settings,Item Naming By,Artículo Naming Por
+DocType: Stock Settings,Item Naming By,Nombres de Artículos por
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,desde la cotización
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la Fabricación
@@ -2670,7 +2670,7 @@ DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,Reordenar Cantidad
 DocType: Company,Stock Adjustment Account,Cuenta de Ajuste de existencias
 DocType: Sales Invoice,Write Off,Cancelar
-DocType: Time Log,Operation ID,Operación ID
+DocType: Time Log,Operation ID,ID de Operación
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
 DocType: Task,depends_on,depende de
@@ -2708,7 +2708,7 @@ apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +16,Tr
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Número incorrecto de entradas del libro mayor encontrado. Es posible que haya seleccionado una cuenta equivocada en la transacción.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una Cuenta Bancaria
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Fecha de nacimiento no puede ser mayor que la actual.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Fecha de nacimiento no puede ser posterior a la fecha de hoy.
 ,Stock Ageing,Envejecimiento de existencias
 DocType: Purchase Receipt,Automatically updated from BOM table,Actualizado automáticamente en el cuadro de lista de materiales
 apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}' no esta activado
@@ -2725,7 +2725,7 @@ apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Por favor introduzca al menos 1 de facturas en la tabla
 DocType: Pricing Rule,Item Group,Grupo de artículos
-DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio real (a través de los registros de tiempo)
+DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (via Registros Temporales)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de la reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
@@ -2739,7 +2739,7 @@ DocType: Time Log Batch,Total Hours,Total de Horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},El total de Débitos debe ser igual al total de Créditos. La diferencia es {0} 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Automotor
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0}
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Se requiere de artículos
+apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Articulo es requerido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,Moldeo por inyección de metal
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,De la nota de entrega
 DocType: Time Log,From Time,From Time
@@ -2836,7 +2836,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,Entretenimiento y Ocio
 DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
-DocType: Quality Inspection,Item Serial No,N º de serie del artículo
+DocType: Quality Inspection,Item Serial No,Nº de Serie del Artículo
 apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Presente
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,Hora
@@ -2885,12 +2885,12 @@ DocType: GL Entry,Against Voucher Type,Contra Comprobante Tipo
 DocType: POS Setting,POS Setting,POS Ajuste
 DocType: Packing Slip,Get Items,Obtener Artículos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Please enter Write Off Account,Por favor introduce Escriba Off Cuenta
-DocType: DocField,Image,imagen
+DocType: DocField,Image,Imagen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +220,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Hacer Lista de Empaque
 DocType: Communication,Other,Otro
 DocType: C-Form,C-Form,C - Forma
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,ID Operación no establece
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,ID de Operación no definido
 DocType: Production Order,Planned Start Date,Fecha de inicio prevista
 DocType: Serial No,Creation Document Type,Tipo de creación de documentos
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
@@ -2944,7 +2944,7 @@ apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Re
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Continuous casting,La colada continua
 sites/assets/js/erpnext.min.js +6,Please specify a,"Por favor, especifique un"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Hacer factura de compra
-DocType: Offer Letter,Awaiting Response,Espera de la respuesta
+DocType: Offer Letter,Awaiting Response,Esperando la Respuesta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Cold sizing,Dimensionamiento Fría
 DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
@@ -3008,7 +3008,7 @@ DocType: Naming Series,Check this if you want to force the user to select a seri
 apps/erpnext/erpnext/stock/get_item_details.py +108,No Item with Serial No {0},Ningún artículo con Serial No {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos Directos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +645,Do you really want to UNSTOP this Material Request?,¿De verdad quiere destapar esta demanda de materiales?
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos del nuevo Cliente
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos por Nuevo Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque
@@ -3068,7 +3068,7 @@ DocType: Address,Preferred Billing Address,Preferida Dirección de Facturación
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,Secretario
 DocType: Serial No,Distinct unit of an Item,Unidad distinta de un artículo
-apps/erpnext/erpnext/config/setup.py +96,Item master.,Maestro de artículos .
+apps/erpnext/erpnext/config/setup.py +96,Item master.,Maestro de Artículos .
 DocType: Pricing Rule,Buying,Compra
 DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este Grupo de Horas Registradas se ha facturado.
@@ -3188,13 +3188,13 @@ DocType: Item,You can enter the minimum quantity of this item to be ordered.,Pue
 DocType: Sales Partner,Partner's Website,Sitio Web del Socio
 DocType: Opportunity,To Discuss,Para Discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas temporales
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas Temporales
 DocType: Payment Tool,Column Break 1,Columna Pausa 1
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Artículo
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hacer una Oferta Carta
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hacer una Carta de Oferta
 DocType: DocField,Fold,Plegar
 DocType: Production Order Operation,Production Order Operation,Orden de Producción Operación
 DocType: Pricing Rule,Disable,Inhabilitar
@@ -3258,7 +3258,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Electrof
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +147,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Orden de Compra, Factura de Compra o Comprobante de Diario"
 DocType: Account,Stock Adjustment,Ajuste de existencias
 DocType: Production Order,Planned Operating Cost,Planeado Costo de funcionamiento
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Nueva {0} Nombre
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Nuevo {0} Nombre
 apps/erpnext/erpnext/controllers/recurring_document.py +126,Please find attached {0} #{1},Encuentre {0} # adjunto {1}
 DocType: Global Defaults,jsonrates.com API Key,jsonrates.com Clave API
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
@@ -3282,7 +3282,7 @@ DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be creat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,Gerente de Proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,despacho
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
 DocType: Account,Receivable,Cuenta por Cobrar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
@@ -3377,7 +3377,7 @@ DocType: Communication,Series,Serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
 DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
 DocType: Communication,Email,Correo Electronico
-DocType: Item Group,Item Classification,Clasificación de artículos
+DocType: Item Group,Item Classification,Clasificación de Artículos
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Gerente de Desarrollo de Negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
@@ -3449,7 +3449,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Rolling,
 DocType: ToDo,Priority,Prioridad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +168,"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 ."
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Quitar elemento si los cargos no son aplicables a dicho elemento
-DocType: Backup Manager,Dropbox Access Allowed,Dropbox Acceso mascotas
+DocType: Backup Manager,Dropbox Access Allowed,Acceso a Dropbox Permitido
 DocType: Backup Manager,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
 DocType: Maintenance Visit,Fully Completed,totalmente Terminado
@@ -3559,7 +3559,7 @@ DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de
 DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
 apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +22,Do you really want to Submit all Salary Slip for month {0} and year {1},¿De verdad quieres a que me envíen toda la nómina para el mes {0} y {1} años
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Los suscriptores de importación
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar Suscriptores
 DocType: Target Detail,Target Qty,Cantidad Objetivo
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
@@ -3635,7 +3635,7 @@ DocType: Account,Equity,Patrimonio
 DocType: Task,Closing Date,Fecha de Cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +79,Engineer,Ingeniero
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Código del artículo requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Código del Artículo requerido en la Fila No {0}
 DocType: Sales Partner,Partner Type,Tipo de Socio
 DocType: Purchase Taxes and Charges,Actual,Real
 DocType: Purchase Order,% of materials received against this Purchase Order,% Del material recibido en contra de esta Orden de Compra
@@ -3707,7 +3707,7 @@ DocType: BOM,Quantity of item obtained after manufacturing / repacking from give
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Cuenta de Pago
 DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
 DocType: Item,Default Warehouse,Almacén por Defecto
-DocType: Task,Actual End Date (via Time Logs),Actual Fecha de finalización (a través de los registros de tiempo)
+DocType: Task,Actual End Date (via Time Logs),Fecha actual de finalización (via Registros Temporales)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,"Por favor, introduzca el centro de coste de los padres"
 DocType: Delivery Note,Print Without Amount,Imprimir sin Importe
 apps/erpnext/erpnext/controllers/buying_controller.py +70,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
@@ -3761,7 +3761,7 @@ apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0}
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,De Oportunidades
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficios a los empleados
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficios a los Empleados
 DocType: Sales Invoice,Is POS,Es POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +224,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elmento {0} en la fila {1}
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
@@ -3770,7 +3770,7 @@ apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturas
 DocType: DocField,Default,Defecto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificación del proyecto
 DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Al seleccionar "" Sí"" permitirá que este tema aparezca en la Orden de Compra , recibo de compra ."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonados añadirse
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonados añadidos
 DocType: Maintenance Schedule,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
 DocType: Serial No,Available,Disponible

erpnext/translations/fa.csv

@@ -77,10 +77,10 @@ sites/assets/js/erpnext.min.js +50,Please select Price List,لطفا لیست ق
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,نجاری
 DocType: Production Order Operation,Work In Progress,کار در حال انجام
 DocType: Company,If Monthly Budget Exceeded,اگر بودجه ماهانه فراتر از
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,چاپ 3D
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,چاپ سه بعدی
 DocType: Employee,Holiday List,فهرست تعطیلات
 DocType: Time Log,Time Log,زمان ورود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,محاسب
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,حسابدار
 DocType: Company,Phone No,تلفن
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",ورود از فعالیت های انجام شده توسط کاربران در برابر وظایف است که می تواند برای ردیابی زمان، صدور صورت حساب استفاده می شود.
 apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},جدید {0}: # {1}
@@ -116,17 +116,17 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee N
 DocType: POS Setting,Write Off Cost Center,ارسال فعال مرکز هزینه
 DocType: Warehouse,Warehouse Detail,جزئیات انبار
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,پدر و مادر مورد {0} باید مورد سهام نمی شود و باید مورد فروش می شود
 DocType: Item,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
 DocType: SMS Log,SMS Log,SMS ورود
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
 DocType: Blog Post,Guest,مهمان
 DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
 DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,بیل از مواد
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,صورت مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},از {0} به {1}
 DocType: Item,Copy From Item Group,کپی برداری از مورد گروه
 DocType: Journal Entry,Opening Entry,ورود افتتاح
@@ -415,7 +415,7 @@ DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,کارشناسی ارشد تعطیلات.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Shell molding,قالب ریزی و سازه پوسته
 DocType: Material Request Item,Required Date,تاریخ مورد نیاز
-DocType: Delivery Note,Billing Address,آدرس قبض
+DocType: Delivery Note,Billing Address,نشانی صورتحساب
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,لطفا کد مورد را وارد کنید.
 DocType: BOM,Costing,هزینه یابی
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
@@ -436,7 +436,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Fused d
 DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
 DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.",توجه: پشتیبان گیری و فایل ها از Google Drive حذف نیست، شما باید به صورت دستی آنها را حذف کنید.
 DocType: Customer,Buyer of Goods and Services.,خریدار کالا و خدمات.
-DocType: Journal Entry,Accounts Payable,حساب های قابل پرداخت
+DocType: Journal Entry,Accounts Payable,حساب های پرداختنی
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,اضافه کردن مشترکین
 sites/assets/js/erpnext.min.js +2,""" does not exists","به این وجود دارد نمی
 DocType: Pricing Rule,Valid Upto,معتبر تا حد
@@ -481,7 +481,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,I
 apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} آدرس ایمیل نامعتبر در 'هشدار از طریق \ آدرس ایمیل' است
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,حسابداری مجموع این سال:
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,اضافه کردن مالیات / ویرایش و اتهامات
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),بسته شدن (کروم)
@@ -538,7 +538,7 @@ apps/erpnext/erpnext/config/setup.py +85,Masters,کارشناسی ارشد
 apps/erpnext/erpnext/stock/stock_ledger.py +316,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
 DocType: Packing Slip Item,DN Detail,جزئیات DN
-DocType: Time Log,Billed,ثبت شده در صورتحساب یا لیست
+DocType: Time Log,Billed,فاکتور شده
 DocType: Batch,Batch Description,دسته توضیحات
 DocType: Delivery Note,Time at which items were delivered from warehouse,زمانی که در آن اقلام از انبار تحویل داده شد
 DocType: Sales Invoice,Sales Taxes and Charges,مالیات فروش و اتهامات
@@ -560,7 +560,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,م
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,از رسید خرید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
 DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,بر اساس "و" گروه توسط "نمی تواند به همان
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
 DocType: Sales Person,Sales Person Targets,اهداف فرد از فروش
 sites/assets/js/form.min.js +253,To,برای
 apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,لطفا آدرس ایمیل را وارد کنید
@@ -592,13 +592,13 @@ sites/assets/js/desk.min.js +555,Rename,تغییر نام
 DocType: Purchase Invoice,Write Off Amount,ارسال فعال مقدار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Bending,خم
 DocType: Leave Block List Allow,Allow User,اجازه می دهد کاربر
-DocType: Journal Entry,Bill No,بیل بدون
+DocType: Journal Entry,Bill No,شماره صورتحساب
 DocType: Purchase Invoice,Quarterly,فصلنامه
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
 DocType: Sales Order Item,Basic Rate (Company Currency),نرخ پایه (شرکت ارز)
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,لطفا جزئیات آیتم را وارد کنید
 DocType: Purchase Receipt,Other Details,سایر مشخصات
-DocType: Account,Accounts,حساب
+DocType: Account,Accounts,حسابها
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,بازار یابی
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Straight shearing,قیچی و برش مستقیم
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,برای پیگیری آیتم در فروش و خرید اسناد بر اساس NOS سریال خود را. این هم می تواند برای پیگیری جزئیات ضمانت محصول استفاده می شود.
@@ -634,7 +634,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} است مورد سهام نمی
 DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
-DocType: Contact Us Settings,Address Title,آدرس عنوان
+DocType: Contact Us Settings,Address Title,عنوان نشانی
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +32,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
 ,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
@@ -683,7 +683,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.",قالب مالیاتی استاندارد است که می تواند به تمام معاملات فروش اعمال می شود. این الگو می تواند شامل لیستی از سر مالیات و همچنین دیگر سر هزینه / درآمد مانند "حمل و نقل"، "بیمه"، "سیستم های انتقال مواد" و غیره #### توجه داشته باشید نرخ مالیات در اینجا تعریف می کنید خواهد بود که نرخ مالیات استاندارد برای همه ** آیتم ها **. اگر تعداد آیتم ها ** ** که نرخ های مختلف وجود دارد، آنها باید در مورد مالیات ** ** جدول اضافه می شود در مورد ** ** استاد. #### شرح ستون 1. نوع محاسبه: - این می تواند بر روی ** ** خالص مجموع باشد (که مجموع مبلغ پایه است). - ** در انتظار قبلی مجموع / مقدار ** (برای مالیات تجمعی و یا اتهامات عنوان شده علیه). اگر شما این گزینه را انتخاب کنید، مالیات به عنوان یک درصد از سطر قبلی (در جدول مالیاتی) و یا مقدار کل اعمال می شود. - ** ** واقعی (به عنوان ذکر شده). 2. حساب سر: دفتر حساب که تحت آن این مالیات خواهد شد رزرو 3. مرکز هزینه: اگر مالیات / هزینه درآمد (مانند حمل و نقل) است و یا هزینه آن نیاز دارد تا در برابر یک مرکز هزینه رزرو شود. 4. توضیحات: توضیحات از مالیات (که در فاکتورها / به نقل از چاپ). 5. نرخ: نرخ مالیات. 6. مقدار: مبلغ مالیات. 7. مجموع: مجموع تجمعی به این نقطه است. 8. ردیف را وارد کنید: اگر بر اساس "سطر قبلی مجموع" شما می توانید تعداد ردیف خواهد شد که به عنوان پایه ای برای این محاسبه (به طور پیش فرض سطر قبلی است) گرفته شده را انتخاب کنید. 9. آیا این مالیات شامل در نرخ پایه ؟: اگر شما این را بررسی کنید، به این معنی که این مالیات خواهد شد جدول زیر نشان داده شده مورد نیست، اما خواهد شد در نرخ پایه در جدول آیتم های اصلی خود را گنجانده شده است. این بسیار مفید است که در آن شما می خواهید را قیمت تخت (شامل تمام مالیات) قیمت به مشتریان.
 DocType: Serial No,Purchase Returned,خرید برگشتی
-DocType: Employee,Bank A/C No.,شماره بانک A / C
+DocType: Employee,Bank A/C No.,شماره حساب بانک
 DocType: Email Digest,Scheduler Failed Events,زمانبند شکست خورد رویدادها
 DocType: Expense Claim,Project,پروژه
 DocType: Quality Inspection Reading,Reading 7,خواندن 7
@@ -705,7 +705,7 @@ apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,بد
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,شماره
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات بانک آشتی
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,فاکتورها من
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,بدون کارمند یافت
 DocType: Purchase Order,Stopped,متوقف
@@ -865,7 +865,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Trimming
 DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هزینه فرود رسید خرید
 DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
-DocType: POS Setting,Cash/Bank Account,نقدی / حساب بانکی
+DocType: POS Setting,Cash/Bank Account,نقد / حساب بانکی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
@@ -896,7 +896,7 @@ DocType: Serial No,Sales Returned,فروش بازگشت
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,فروش مقدار
 apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,زمان ثبت
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب هزینه برای این سابقه بوده است. لطفا "وضعیت و ذخیره به روز رسانی
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Issue,Issue,موضوع
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
@@ -935,13 +935,13 @@ DocType: Supplier,Default Currency,به طور پیش فرض ارز
 DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
 DocType: Contact Us Settings,Address,نشانی
 DocType: Expense Claim,From Employee,از کارمند
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} در هر سال مالی. برای جزئیات بیشتر {2}.
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} در هیچ سال مالی وجود ندارد. برای جزئیات بیشتر {2}.
 apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
 DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
 DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
 DocType: Appraisal Template Goal,Key Performance Area,کلید عملکرد منطقه
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,حمل و نقل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} باید قطعی شود
 DocType: SMS Center,Total Characters,مجموع شخصیت
 apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,جزئیات C-فرم فاکتور
@@ -968,7 +968,7 @@ DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,درامد
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,هیچ چیز برای درخواست
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','واقعی تاریخ شروع نمی تواند بیشتر از' پایان واقعی تاریخ '
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,اداره
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,نوع فعالیت برای ورق های زمان
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,ریخته گری سرمایه گذاری
@@ -1025,7 +1025,7 @@ DocType: Sales Order,Delivery Status,تحویل وضعیت
 DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
-,Budget Variance Report,بودجه واریانس گزارش
+,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,سود سهام پرداخت
 DocType: Stock Reconciliation,Difference Amount,مقدار تفاوت
@@ -1044,12 +1044,12 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryoroll
 ,Employee Leave Balance,کارمند مرخصی تعادل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},تعادل برای حساب {0} همیشه باید {1}
 DocType: Sales Invoice,More Info,اطلاعات بیشتر
-DocType: Address,Address Type,آدرس نوع
+DocType: Address,Address Type,نوع نشانی
 DocType: Purchase Receipt,Rejected Warehouse,انبار را رد کرد
 DocType: GL Entry,Against Voucher,علیه کوپن
 DocType: Item,Default Buying Cost Center,به طور پیش فرض مرکز هزینه خرید
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,مورد {0} باید مورد فروش می شود
-,Accounts Payable Summary,حساب خلاصه پرداختنی
+,Accounts Payable Summary,خلاصه  حسابهای  پرداختنی
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
@@ -1145,7 +1145,7 @@ apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot b
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +99,Status updated to {0},وضعیت به روز شده برای {0}
 DocType: DocField,Description,شرح
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
-DocType: Backup Manager,Backup Manager,مدیریت پشتیبانی
+DocType: Backup Manager,Backup Manager,مدیریت پشتیبان گیری
 DocType: Letter Head,Is Default,آیا پیش فرض
 DocType: Address,Utilities,نرم افزار
 DocType: Purchase Invoice Item,Accounting,حسابداری
@@ -1166,7 +1166,7 @@ DocType: Pricing Rule,Campaign,کمپین
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید "تایید" یا "رد"
 DocType: Sales Invoice,Sales BOM Help,BOM فروش راهنما
 DocType: Purchase Invoice,Contact Person,شخص تماس
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date','انتظار تاریخ شروع' می تواند بیشتر از 'انتظار پایان تاریخ "نمی
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"'تاریخ شروع پیش بینی شده' نمی تواند بیشتر از 'تاریخ پایان پیش بینی شده"" باشد"
 DocType: Holiday List,Holidays,تعطیلات
 DocType: Sales Order Item,Planned Quantity,تعداد برنامه ریزی شده
 DocType: Purchase Invoice Item,Item Tax Amount,مبلغ مالیات مورد
@@ -1179,7 +1179,7 @@ DocType: Email Digest,For Company,برای شرکت
 apps/erpnext/erpnext/config/support.py +38,Communication log.,ورود به سیستم ارتباطات.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,مقدار خرید
 DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,نمودار حساب
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +506,cannot be greater than 100,نمی تواند بیشتر از 100
 DocType: Purchase Receipt Item,Discount  %,تخفیف٪
@@ -1270,7 +1270,7 @@ DocType: Workflow State,Tasks,وظایف
 DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
 DocType: Event,Tuesday,سهشنبه
 DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
-,Accounts Receivable Summary,حساب خلاصه دریافتنی
+,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
 DocType: UOM,UOM Name,نام UOM
 DocType: Top Bar Item,Target,هدف
@@ -1331,12 +1331,12 @@ apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_st
 DocType: Email Digest,Expenses Booked,هزینه رزرو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +168,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
 DocType: Quotation Item,Quotation Item,مورد نقل قول
-DocType: Account,Account Name,نام کاربری
+DocType: Account,Account Name,نام حساب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} quantity {1} cannot be a fraction,سریال بدون {0} مقدار {1} می تواند یک بخش نمی
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,اضافه کردن
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,افزودن
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
 DocType: Accounts Settings,Credit Controller,کنترل اعتبار
 DocType: Delivery Note,Vehicle Dispatch Date,اعزام خودرو تاریخ
@@ -1410,7 +1410,7 @@ DocType: Email Digest,Total amount of invoices sent to the customer during the d
 DocType: Item,Weightage,بین وزنها
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Mining,استخراج معدن
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Resin casting,ریخته گری رزین
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +79,A Customer Group exists with same name please change the Customer name or rename the Customer Group,مشتری گروه با همین نام وجود دارد لطفا نام مشتری تغییر و یا تغییر نام گروه به مشتری
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +79,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
 DocType: Territory,Parent Territory,سرزمین پدر و مادر
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
 DocType: Stock Entry,Material Receipt,دریافت مواد
@@ -1455,11 +1455,11 @@ apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,متقاضی برای
 DocType: Sales Invoice Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
 DocType: Country,Country,کشور
-apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,آدرس
+apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,نشانی ها
 DocType: Communication,Received,رسیده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرایط برای حکومت حمل و نقل
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master",نام حساب جدید. توجه: لطفا برای حساب های مشتریان و تامین کنندگان ایجاد نمی کنند، آنها به طور خودکار از مشتری و تامین کننده اصلی ایجاد
 DocType: DocField,Attach Image,ضمیمه تصویر
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص از اقلام محاسبه)
@@ -1475,7 +1475,7 @@ DocType: Employee,Salutation,سلام
 DocType: Offer Letter,Rejected,رد
 DocType: Pricing Rule,Brand,مارک
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,٪ تحویل
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,٪ تحویل شده
 apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,موارد نرم افزاری در زمان فروش.
 DocType: Sales Order Item,Actual Qty,تعداد واقعی
 DocType: Quality Inspection Reading,Reading 10,خواندن 10
@@ -1536,12 +1536,12 @@ apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
 DocType: Maintenance Visit,Maintenance Time,نگهداری زمان
 ,Amount to Deliver,مقدار برای ارائه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,یک محصول یا خدمات
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,یک محصول یا خدمت
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,خطاهایی وجود دارد.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,بهره برداری
 DocType: Naming Series,Current Value,ارزش فعلی
 apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},مورد الگو می تواند سهام و varaiants ندارد. لطفا سهام را از انبارها {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} ایجاد شد
 DocType: Journal Entry Account,Against Sales Order,علیه سفارش فروش
 ,Serial No Status,سریال نیست
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,جدول مورد نمیتواند خالی باشد
@@ -1608,7 +1608,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit
 apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.",عنوان سفارش تولید می توان برای این آیتم به ساخته شده، آن را باید یک مورد سهام باشد.
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,پیوستن
-DocType: Authorization Rule,Above Value,بالا ارزش
+DocType: Authorization Rule,Above Value,بالاتر از ارزش 
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
 DocType: Serial No,Delivered,تحویل
@@ -1703,7 +1703,7 @@ DocType: Global Defaults,Default Company,به طور پیش فرض شرکت
 apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} ​​بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
 DocType: Employee,Bank Name,نام بانک
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-بالا
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,کاربر {0} غیر فعال است
 DocType: Leave Application,Total Leave Days,مجموع مرخصی روز
 DocType: Email Digest,Note: Email will not be sent to disabled users,توجه: ایمیل را به کاربران غیر فعال شده ارسال نمی شود
@@ -1893,7 +1893,7 @@ DocType: Email Digest,Calendar Events,وقایع و تقویم
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +108,Pharmaceutical,دارویی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,هزینه اقلام خریداری شده
 DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد و ضوابط
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد مشتری
 DocType: Purchase Invoice,Credit To,اعتبار به
 DocType: Employee Education,Post Graduate,فوق لیسانس
 DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.",توجه: پشتیبان گیری و فایل ها از Dropbox حذف نیست، شما باید به صورت دستی آنها را حذف کنید.
@@ -1924,7 +1924,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rat
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} قطعی نشده است
 apps/erpnext/erpnext/config/stock.py +13,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
 DocType: Email Digest,New Communications,ارتباطات جدید
@@ -1952,7 +1952,7 @@ DocType: Email Digest,How frequently?,چگونه غالبا؟
 DocType: Purchase Receipt,Get Current Stock,دریافت سهام کنونی
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,نصب و راه اندازی را توجه داشته باشید
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
-DocType: Production Order,Actual End Date,واقعی پایان تاریخ
+DocType: Production Order,Actual End Date,تاریخ واقعی پایان
 DocType: Authorization Rule,Applicable To (Role),به قابل اجرا (نقش)
 DocType: Stock Entry,Purpose,هدف
 DocType: Item,Will also apply for variants unless overrridden,همچنین برای انواع اعمال می شود مگر اینکه overrridden
@@ -2028,7 +2028,7 @@ apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,شاخه سا
 DocType: Purchase Invoice,Will be calculated automatically when you enter the details,خواهد شد به صورت خودکار محاسبه زمانی که شما وارد جزئیات
 DocType: Delivery Note,Transporter lorry number,تعداد کامیون حمل و نقل
 DocType: Sales Order,Billing Status,حسابداری وضعیت
-DocType: Backup Manager,Backup Right Now,پشتیبان گیری در حال حاضر
+DocType: Backup Manager,Backup Right Now,هم اکنون یک پشتیبان بگیر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,هزینه آب و برق
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-بالاتر از
 DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
@@ -2045,7 +2045,7 @@ DocType: Employee,Emergency Contact,تماس اضطراری
 DocType: Item,Quality Parameters,پارامترهای کیفیت
 DocType: Target Detail,Target  Amount,هدف مقدار
 DocType: Shopping Cart Settings,Shopping Cart Settings,تنظیمات سبد خرید
-DocType: Journal Entry,Accounting Entries,مطالب حسابداری
+DocType: Journal Entry,Accounting Entries,ثبت های حسابداری
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},تکراری ورودی. لطفا بررسی کنید مجوز قانون {0}
 DocType: Purchase Order,Ref SQ,SQ کد عکس
 apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,جایگزین مورد / BOM در تمام BOMs
@@ -2062,7 +2062,7 @@ DocType: Landed Cost Voucher,Purchase Receipt Items,آیتم ها رسید خر
 DocType: Party Type,Parent Party Type,پدر و مادر نوع حزب
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Cutting,برش
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flattening,تنظیمات کوپن
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,پشتیبان گیری خواهد شد به آپلود
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,پشتیبان تهیه شده آپلود خواند شد در 
 DocType: Account,Income Account,حساب درآمد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,قالب ریزی
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
@@ -2104,7 +2104,7 @@ apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,مسائل مربوط ب
 apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},وضعیت باید یکی از است {0}
 DocType: Sales Invoice,Debit To,بدهی به
 DocType: Delivery Note,Required only for sample item.,فقط برای نمونه مورد نیاز است.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از معامله
+DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,خیلی بزرگ
 ,Profit and Loss Statement,بیانیه سود و زیان
@@ -2161,14 +2161,14 @@ Examples:
 1. Address and Contact of your Company.",شرایط و ضوابط استاندارد است که می تواند به خرید و فروش اضافه شده است. مثال: 1. اعتبار ارائه دهد. 1. شرایط پرداخت (در پیش است، در اعتبار، بخشی از پیش و غیره). 1. چه اضافی (یا قابل پرداخت توسط مشتری) می باشد. 1. ایمنی هشدار / استفاده. 1. گارانتی در صورت وجود. 1. بازگرداندن سیاست. 1. شرایط حمل و نقل، اگر قابل اجرا است. 1. راه های مقابله با اختلافات، غرامت، مسئولیت، و غیره 1. آدرس و تماس با شرکت شما.
 DocType: Attendance,Leave Type,نوع مرخصی
 apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری '، سود و ضرر باشد
-DocType: Account,Accounts User,حساب کاربری
+DocType: Account,Accounts User,کاربر حسابها
 DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",بررسی کنید که تکرار فاکتور، تیک برای جلوگیری از تکرار و یا قرار دادن پایان مناسب عضویت
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
 apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,حداکثر {0} ردیف اجازه
 DocType: C-Form Invoice Detail,Net Total,مجموع خالص
 DocType: Bin,FCFS Rate,FCFS نرخ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),حسابداری (فاکتور فروش)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),صورت حساب (فاکتور فروش)
 DocType: Payment Reconciliation Invoice,Outstanding Amount,مقدار برجسته
 DocType: Project Task,Working,کار
 DocType: Stock Ledger Entry,Stock Queue (FIFO),سهام صف (FIFO)
@@ -2207,7 +2207,7 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount
 DocType: Purchase Invoice,Half-yearly,نیمه سال
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,سال مالی {0} یافت نشد.
 DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرتبط
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,ثبت حسابداری برای سهام
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,ثبت حسابداری برای انبار
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,ضرب
 DocType: Sales Invoice,Sales Team1,Team1 فروش
 apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,مورد {0} وجود ندارد
@@ -2289,7 +2289,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py +123,Please enter relieving
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +237,Serial No {0} status must be 'Available' to Deliver,سریال بدون {0} وضعیت باید در دسترس به تحویل می شود
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت "تایید" را می توان ارائه بگذارید
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,آدرس عنوان الزامی است.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,روزنامه
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
@@ -2320,7 +2320,7 @@ apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,سفارشات
 DocType: Leave Control Panel,Employee Type,نوع کارمند
 DocType: Employee Leave Approver,Leave Approver,ترک تصویب
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,سنبه کاری
-DocType: Expense Claim,"A user with ""Expense Approver"" role",کاربر با نقش "هزینه تصویب"
+DocType: Expense Claim,"A user with ""Expense Approver"" role","یک کاربر با نقشه ""تایید کننده هزینه ها"""
 ,Issued Items Against Production Order,آیتم صادره علیه سفارش تولید
 DocType: Pricing Rule,Purchase Manager,مدیر خرید
 DocType: Payment Tool,Payment Tool,ابزار پرداخت
@@ -2382,8 +2382,8 @@ DocType: Stock Settings,Default Stock UOM,به طور پیش فرض بورس UOM
 DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
 DocType: Employee Education,School/University,مدرسه / دانشگاه
 DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
-,Billed Amount,مقدار ثبت شده در صورتحساب
+,Billed Amount,مقدار فاکتور شده
-DocType: Bank Reconciliation,Bank Reconciliation,بانک آشتی
+DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 DocType: Purchase Invoice,Total Amount To Pay,مقدار کل به پرداخت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
 DocType: Event,Groups,گروه
@@ -2398,7 +2398,7 @@ DocType: Features Setup,Sales Extras,فروش افزودنیهای پیشنها
 apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
 DocType: Leave Allocation,Carry Forwarded Leaves,برگ فرستاده حمل
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','از تاریخ باید پس از "به روز" است
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 ,Stock Projected Qty,سهام بینی تعداد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Warranty Claim,From Company,از شرکت
@@ -2415,7 +2415,7 @@ apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,A
 apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
-DocType: Sales Order,%  Delivered,٪ تحویل
+DocType: Sales Order,%  Delivered,٪ تحویل شده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,بانک حساب چک بی محل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,را لغزش حقوق
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Unstop
@@ -2460,7 +2460,7 @@ DocType: Packing Slip,The gross weight of the package. Usually net weight + pack
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
 DocType: Serial No,Is Cancelled,آیا لغو
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,محموله من
-DocType: Journal Entry,Bill Date,بیل عضویت
+DocType: Journal Entry,Bill Date,تاریخ صورتحساب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
 DocType: Communication,Recipients,دریافت کنندگان
@@ -2689,7 +2689,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Intern,ان
 DocType: Newsletter,A Lead with this email id should exist,سرب با این ایمیل ID باید وجود داشته باشد
 DocType: Stock Entry,From BOM,از BOM
 DocType: Time Log,Billing Rate (per hour),نرخ حسابداری (در ساعت)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,اساسی
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +226,Please click on 'Generate Schedule',لطفا بر روی 'ایجاد برنامه کلیک کنید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
@@ -2739,7 +2739,7 @@ DocType: Journal Entry,Print Heading,چاپ سرنویس
 DocType: Quotation,Maintenance Manager,مدیر نگهداری و تعمیرات
 DocType: Workflow State,Search,جستجو
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,مجموع نمیتواند صفر باشد
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,'روز پس از آخرین سفارش باید بزرگتر یا مساوی صفر باشد
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,"""روز پس از آخرین سفارش"" باید بزرگتر یا مساوی صفر باشد"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,لحیم کاری
 DocType: C-Form,Amended From,اصلاح از
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,مواد اولیه
@@ -2776,7 +2776,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,انتقال مواد به تامین کننده
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,ایجاد عبارت
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,ایجاد استعلام
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},می توان با تصویب {0}
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
@@ -3009,7 +3009,7 @@ DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات
 DocType: Purchase Order Item,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,اتو
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} است متوقف
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} متوقف است
 apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
@@ -3110,7 +3110,7 @@ DocType: Address,Shipping,حمل
 DocType: Stock Ledger Entry,Stock Ledger Entry,سهام لجر ورود
 DocType: Department,Leave Block List,ترک فهرست بلوک
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Item {0} is not setup for Serial Nos. Column must be blank,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
-DocType: Accounts Settings,Accounts Settings,حساب تنظیمات
+DocType: Accounts Settings,Accounts Settings,تنظیمات حسابها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,امکانات و ماشین آلات
 DocType: Item,You can enter the minimum quantity of this item to be ordered.,شما می توانید وارد کنید حداقل مقدار این آیتم به دستور داده شود.
 DocType: Sales Partner,Partner's Website,وب سایت همکار
@@ -3168,7 +3168,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sal
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 DocType: Notification Control,Purchase,خرید
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},وضعیت {0} {1} در حال حاضر {2}
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,تعادل تعداد
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,تعداد موجودی
 DocType: Item Group,Parent Item Group,مورد گروه پدر و مادر
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} برای {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,مراکز هزینه
@@ -3319,7 +3319,7 @@ DocType: Features Setup,To get Item Group in details table,برای دریافت
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Redrawing,ترسیم مجدد
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Etching,قلم زنی
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +55,Commission,کمیسیون
-apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,شما امکان پذیر نیست برای پاسخ به این بلیط.
+apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,شما مجاز به پاسخ دهی به این  درخواست نیستید
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
 <pre><code>{{ address_line1 }}&lt;br&gt;
@@ -3336,7 +3336,7 @@ DocType: Salary Slip Deduction,Default Amount,مقدار پیش فرض
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,انبار در سیستم یافت نشد
 DocType: Quality Inspection Reading,Quality Inspection Reading,خواندن بازرسی کیفیت
 DocType: Party Account,col_break1,col_break1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام یخ قدیمی تر Than` باید کوچکتر از٪ d روز باشد.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 ,Project wise Stock Tracking,پروژه پیگیری سهام عاقلانه
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},نگهداری و تعمیرات برنامه {0} در برابر وجود دارد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),تعداد واقعی (در منبع / هدف)
@@ -3359,7 +3359,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You ca
 DocType: Purchase Invoice Item,Price List Rate,لیست قیمت نرخ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,تحویل سریال بدون {0} نمی تواند حذف شود
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",نمایش &quot;در انبار&quot; و یا &quot;نه در بورس&quot; بر اساس سهام موجود در این انبار.
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),بیل از مواد (BOM)
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),صورت مواد (BOM)
 DocType: Time Log,Hours,ساعت
 DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Rolling,نورد
@@ -3386,7 +3386,7 @@ apps/erpnext/erpnext/config/stock.py +141,Main Reports,گزارش اصلی
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +73,Stock Ledger entries balances updated,سهام لجر نوشته توازن به روز شده
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,اضافه کردن / ویرایش قیمت
+apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,افزودن / ویرایش قیمتها
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,نمودار مراکز هزینه
 ,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,سفارشات من
@@ -3430,7 +3430,7 @@ DocType: Naming Series,Help HTML,راهنما HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
 DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,تامین کنندگان خود را
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +58,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,یکی دیگر از ساختار حقوق {0} برای کارکنان فعال است {1}. لطفا مطمئن وضعیت خود را غیر فعال &#39;به عنوان خوانده شده
 DocType: Purchase Invoice,Contact,تماس
@@ -3443,7 +3443,7 @@ DocType: Issue,Content Type,نوع محتوا
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +63,You are not authorized to set Frozen value,شما مجاز به مقدار منجمد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +63,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Purchase Receipt,Date on which lorry started from supplier warehouse,تاریخ که در آن کامیون را از منبع انبار آغاز شده
 DocType: Cost Center,Budgets,بودجه
@@ -3453,7 +3453,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it d
 DocType: Delivery Note,To Warehouse,به انبار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},حساب {0} است بیش از یک بار برای سال مالی وارد شده است {1}
 ,Average Commission Rate,متوسط ​​نرخ کمیسیون
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,&quot;فاقد سریال&quot; نمی تواند به &#39;بله&#39; برای غیر سهام مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
@@ -3509,7 +3509,7 @@ DocType: Sales Invoice,Existing Customer,مشتری های موجود
 DocType: Email Digest,Receivables,مطالبات
 DocType: Quality Inspection Reading,Reading 5,خواندن 5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date",را وارد کنید ایمیل ID با کاما جدا شده، منظور خواهد شد به صورت خودکار در زمان مشخص از طریق پست
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,نام کمپین مورد نیاز است
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,نام کمپین الزامی است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,گرد فعال
 DocType: Maintenance Visit,Maintenance Date,نگهداری و تعمیرات تاریخ
 DocType: Purchase Receipt Item,Rejected Serial No,رد سریال
@@ -3686,7 +3686,7 @@ apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,لوای
 DocType: DocField,Default,پیش فرض
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
 DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.",انتخاب &quot;بله&quot; اجازه خواهد داد که این مورد در سفارش خرید، رسید خرید را ظاهر می شود.
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} مشترکین اضافه
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} مشترک افزوده شد
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Account,Parent Account,پدر و مادر حساب
 DocType: Serial No,Available,در دسترس
@@ -3811,6 +3811,6 @@ DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Account {0} does not exist,حساب {0} وجود ندارد
-DocType: Account,Cash,پول نقد
+DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},لطفا ساختار حقوق برای کارکنان ایجاد {0}

erpnext/translations/fr.csv

@@ -77,7 +77,7 @@ sites/assets/js/erpnext.min.js +50,Please select Price List,S'il vous plaît
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Travail du bois
 DocType: Production Order Operation,Work In Progress,Work In Progress
 DocType: Company,If Monthly Budget Exceeded,Si le budget mensuel dépassé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impression 3D
+apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impression en 3D
 DocType: Employee,Holiday List,Liste de vacances
 DocType: Time Log,Time Log,Temps Connexion
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Comptable
@@ -130,7 +130,7 @@ apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,De la valeur d
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
 DocType: Journal Entry,Opening Entry,Entrée ouverture
-apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,Restrictions de l'utilisateur
+apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} est obligatoire
 apps/erpnext/erpnext/config/setup.py +111,Contact master.,'N'a pas de série »ne peut pas être « Oui »pour non - article en stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
 DocType: Lead,Product Enquiry,Demande d'information produit
@@ -338,7 +338,7 @@ DocType: Sales Invoice,Rate at which Customer Currency is converted to customer'
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en nomenclature , bon de livraison , facture d'achat , ordre de production, bon de commande , bon de réception , la facture de vente , Sales Order , Stock entrée , des feuilles de temps"
 DocType: Item Tax,Tax Rate,Taux d'imposition
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Sélectionner un élément
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} statut est arrêté
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,L'état {0} {1} est arrêté
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
  Stock réconciliation, utiliser à la place l'entrée en stock géré"
@@ -482,8 +482,7 @@ DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Supprimer Transactions Société
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
 apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
-					Email Address'","{0} est une adresse de courriel valide dans «notification \
+					Email Address'",{0} est une adresse de courriel invalide dans «La notification de l'Adresse électronique'
- Adresse e-mail '"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturation totale de cette année:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
@@ -554,7 +553,7 @@ DocType: Email Digest,New Enquiries,New Renseignements
 DocType: Employee,Reason for Resignation,Raison de la démission
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Modèle pour l'évaluation du rendement .
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Facture / Journal Détails Entrée
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},Profil d'emploi
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' n'est pas dans l'année financière {2}
 DocType: Buying Settings,Settings for Buying Module,Réglages pour l'achat Module
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Se il vous plaît entrer Achat Reçu premier
 DocType: Buying Settings,Supplier Naming By,Fournisseur de nommage par
@@ -566,7 +565,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,dir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,De ticket de caisse
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
 DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Types d'emploi ( permanent, contractuel , stagiaire , etc ) ."
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peut pas être pareil 
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
 sites/assets/js/form.min.js +253,To,à
 apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,Veuillez entrer une adresse E-mail .
@@ -636,8 +635,8 @@ apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +197,Please enter
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you really want to UNSTOP,Voulez-vous vraiment à déboucher
 DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ordre de fabrication {0} doit être soumis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,« De Date ' est nécessaire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} n'est pas une article de stock
 DocType: Mode of Payment Account,Default Account,Compte par défaut
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Chef de file doit être réglée si l'occasion est composé de plomb
 DocType: Contact Us Settings,Address Title,Titre de l'adresse
@@ -768,7 +767,7 @@ DocType: Expense Claim,Expenses,Note: Ce centre de coûts est un groupe . Vous n
 ,Purchase Receipt Trends,Achat Tendances reçus
 DocType: Appraisal,Select template from which you want to get the Goals,Sélectionnez le modèle à partir duquel vous souhaitez obtenir des Objectifs
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Research & Development,Recherche & Développement
-,Amount to Bill,Montant du projet de loi
+,Amount to Bill,Montant à facturer
 DocType: Company,Registration Details,Détails de l'enregistrement
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,Jalonnement
 DocType: Item Reorder,Re-Order Qty,Re-commande Quantité
@@ -968,7 +967,7 @@ DocType: Supplier,Default Currency,Devise par défaut
 DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
 DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,De employés
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1} en aucun exercice. Pour plus de détails, consultez {2}."
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1} n'est pas dans aucun année financière. Pour plus de détails, consultez {2}."
 apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
 DocType: Journal Entry,Make Difference Entry,Assurez Entrée Différence
 DocType: Upload Attendance,Attendance From Date,Participation De Date
@@ -1041,7 +1040,7 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,Non rapprochés dé
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Global Defaults,Disable Rounded Total,Désactiver totale arrondie
 DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,précédent
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
 apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
 ,Trial Balance,Balance
 sites/assets/js/erpnext.min.js +2,"Grid ""","grille """
@@ -1082,7 +1081,7 @@ DocType: Purchase Receipt,Rejected Warehouse,Entrepôt rejetée
 DocType: GL Entry,Against Voucher,Bon contre
 DocType: Item,Default Buying Cost Center,Centre de coûts d'achat par défaut
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,Point {0} doit être objet de vente
-,Accounts Payable Summary,Comptes à payer Résumé
+,Accounts Payable Summary,Le résumé des comptes à payer
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},Message totale (s )
 DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître .
@@ -1152,7 +1151,7 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +7
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taxes et frais de calcul
 DocType: BOM Operation,Workstation,station de travail
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +107,Hardware,Sales Person cible Variance article Groupe Sage
-DocType: Attendance,HR Manager,Directeur des Ressources Humaines
+DocType: Attendance,HR Manager,Responsable des Ressources Humaines
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +47,Privilege Leave,Point {0} doit être fonction Point
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la facture fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +169,You need to enable Shopping Cart,Vous devez activer Panier
@@ -1199,7 +1198,7 @@ DocType: Pricing Rule,Campaign,Campagne
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',Le statut d'approbation doit être 'Approuvé' ou 'Rejeté'
 DocType: Sales Invoice,Sales BOM Help,Aide nomenclature des ventes
 DocType: Purchase Invoice,Contact Person,Personne à contacter
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',Pas de description
+apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date','Début de la date attendue' ne peut pas être supérieur à 'Fin de la date attendue'
 DocType: Holiday List,Holidays,Fêtes
 DocType: Sales Order Item,Planned Quantity,Quantité planifiée
 DocType: Purchase Invoice Item,Item Tax Amount,Taxes article
@@ -1304,7 +1303,7 @@ DocType: Workflow State,Tasks,tâches
 DocType: Landed Cost Voucher,Landed Cost Help,Aide Landed Cost
 DocType: Event,Tuesday,Mardi
 DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
-,Accounts Receivable Summary,Comptes débiteurs Résumé
+,Accounts Receivable Summary,Le résumé de comptes débiteurs
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,Se il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
 DocType: UOM,UOM Name,Nom UDM
 DocType: Top Bar Item,Target,Cible
@@ -1466,7 +1465,7 @@ apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of e
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exporter le rapport et l'imprimer à l'aide d'un tableur.
 DocType: Sales Invoice Item,Batch No,Numéro du lot
-apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Nombre de points pour tous les objectifs devraient être 100 . C'est {0}
+apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Principal
 DocType: DocPerm,Delete,Supprimer
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
 sites/assets/js/desk.min.js +836,New {0},Nouvelle {0}
@@ -1524,7 +1523,7 @@ apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expiré
 DocType: Packing Slip,To Package No.,Pour Emballer n °
 DocType: DocType,System,Système
 DocType: Warranty Claim,Issue Date,Date d'émission
-DocType: Activity Cost,Activity Cost,Activité Coût
+DocType: Activity Cost,Activity Cost,Le coût de l'activité
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,télécommunications
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
@@ -1570,13 +1569,13 @@ DocType: Item,Is Sales Item,Est-Point de vente
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Point arborescence de groupe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Point {0} n'est pas configuré pour maître numéros de série Check Point
 DocType: Maintenance Visit,Maintenance Time,Temps de maintenance
-,Amount to Deliver,Montant Deliver
+,Amount to Deliver,Nombre à livrer
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,Un produit ou service
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,Il y avait des erreurs .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,Tapotement
 DocType: Naming Series,Current Value,Valeur actuelle
 apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},Elément de modèle ne peut pas avoir stock et varaiants. Se il vous plaît retirer stocks des entrepôts {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,L'article est mis à jour
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} créé
 DocType: Journal Entry Account,Against Sales Order,Contre Commande
 ,Serial No Status,N ° de série Statut
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Tableau de l'article ne peut pas être vide
@@ -1588,7 +1587,7 @@ DocType: Employee,Salary Information,Information sur le salaire
 DocType: Sales Person,Name and Employee ID,Nom et ID employé
 apps/erpnext/erpnext/accounts/party.py +186,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
 DocType: Website Item Group,Website Item Group,Groupe Article Site
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,S'il vous plaît mettre trésorerie de défaut ou d'un compte bancaire en mode de paiement {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Frais et taxes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +275,Please enter Reference date,S'il vous plaît entrer Date de référence
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour le point qui sera affiché dans le site Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
@@ -1660,8 +1659,8 @@ DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les entrées rap
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborescence des comptes financiers.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide si cela est jugé pour tous les types d'employés
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer accusations fondées sur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Compte {0} doit être de type ' actif fixe ' comme objet {1} est un atout article
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Compte {0} doit être de type ' Actif ' comme objet {1} est un article Actif
-DocType: HR Settings,HR Settings,Réglages RH
+DocType: HR Settings,HR Settings,Paramètrages RH
 apps/frappe/frappe/config/setup.py +130,Printing,Impression
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,S'il vous plaît entrer comptes débiteurs groupe / à payer en master de l'entreprise
@@ -1704,7 +1703,7 @@ DocType: Quotation,Maintenance User,Maintenance utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Coût Mise à jour
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,Êtes-vous sûr de vouloir déboucher
 DocType: Employee,Date of Birth,Date de naissance
-DocType: Salary Manager,Salary Manager,Salaire Responsable
+DocType: Salary Manager,Salary Manager,Responsable des salaires
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Exercice ** représente un exercice. Toutes les écritures comptables et autres transactions majeures sont suivis contre ** Exercice **.
 DocType: Opportunity,Customer / Lead Address,Client / plomb adresse
@@ -1739,14 +1738,14 @@ DocType: Global Defaults,Default Company,Société défaut
 apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, se il vous plaît situé dans Réglages Stock"
 DocType: Employee,Bank Name,Nom de la banque
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Au-dessous
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,Territoire cible Variance article Groupe Sage
 DocType: Leave Application,Total Leave Days,Total des jours de congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque: E-mail ne sera pas envoyé aux utilisateurs handicapés
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Sélectionnez Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide si cela est jugé pour tous les ministères
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",S'il vous plaît vous connecter à Upvote !
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} est obligatoire pour objet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
 DocType: Currency Exchange,From Currency,De Monnaie
 DocType: DocField,Name,Nom
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
@@ -1771,7 +1770,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""Build
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Remise Itemwise
 DocType: Purchase Receipt,Detailed Breakup of the totals,Breakup détaillée des totaux
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} contre Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
 DocType: Account,Fixed Asset,Actifs immobilisés
 DocType: Time Log Batch,Total Billing Amount,Montant total de la facturation
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte à recevoir
@@ -1861,13 +1860,13 @@ DocType: Supplier,Address & Contacts,Adresse & Coordonnées
 DocType: SMS Log,Sender Name,Nom de l'expéditeur
 DocType: Page,Title,Titre
 sites/assets/js/list.min.js +92,Customize,Personnaliser
-DocType: POS Setting,[Select],[Sélectionner ]
+DocType: POS Setting,[Select],[Choisir ]
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Faire la facture de vente
 DocType: Company,For Reference Only.,Pour référence seulement.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Non valide {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Montant de l'avance
 DocType: Manufacturing Settings,Capacity Planning,Planification des capacités
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Série mise à jour avec succès
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Date début' est nécessaire
 DocType: Journal Entry,Reference Number,Numéro de référence
 DocType: Employee,Employment Details,Détails de l'emploi
 DocType: Employee,New Workplace,Travail du Nouveau-
@@ -2003,7 +2002,7 @@ DocType: Customer,Your Customer's TAX registration numbers (if applicable) or an
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / revendeur / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise pour une commission.
 DocType: Customer Group,Has Child Node,A Node enfant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} contre bon de commande {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamme vieillissement 1
@@ -2087,7 +2086,7 @@ DocType: Delivery Note,Transporter lorry number,Numéro camion transporteur
 DocType: Sales Order,Billing Status,Statut de la facturation
 DocType: Backup Manager,Backup Right Now,Sauvegarder immédiatement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Commande {0} n'est pas soumis
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-dessus
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-dessous
 DocType: Buying Settings,Default Buying Price List,Défaut d'achat Liste des Prix
 DocType: Notification Control,Sales Order Message,Message de commande client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Valeurs par défaut comme : societé , devise , année financière en cours , etc"
@@ -2156,7 +2155,7 @@ apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,Gérer l'arbo
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Nouveau centre de coûts Nom
 DocType: Leave Control Panel,Leave Control Panel,Laisser le Panneau de configuration
 apps/erpnext/erpnext/utilities/doctype/address/address.py +67,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune valeur par défaut Adresse modèle trouvé. S'il vous plaît créer un nouveau à partir de Configuration> Presse et Branding> Adresse modèle.
-DocType: Appraisal,HR User,HR utilisateur
+DocType: Appraisal,HR User,Utilisateur HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et frais déduits
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Questions
 apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},Le statut doit être l'un des {0}
@@ -2182,7 +2181,7 @@ apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.p
 DocType: Stock Settings,Default Valuation Method,Méthode d'évaluation par défaut
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Polishing,Polissage
 DocType: Production Order Operation,Planned Start Time,Heure de début prévue
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Numéroté
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Alloué
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row{0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti ne est applicable contre débiteurs / Comptes fournisseurs
@@ -2243,7 +2242,7 @@ DocType: Payment Reconciliation Invoice,Outstanding Amount,Encours
 DocType: Project Task,Working,De travail
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock file d'attente (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,S'il vous plaît sélectionner registres de temps.
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},joindre l'image
+apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},{0} n'appartient pas à la société {1}
 ,Requested Qty,Quantité demandée
 DocType: BOM Item,Scrap %,Scrap%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Les frais seront distribués proportionnellement en fonction de l'article Quantité ou montant, selon votre sélection"
@@ -2262,7 +2261,7 @@ DocType: Purchase Order Item,Material Request No,Demande de Support Aucun
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Vitesse à laquelle la devise du client est converti en devise de base entreprise
 DocType: Purchase Invoice,Discount Amount (Company Currency),Montant de la remise (Société devise)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès à partir de cette liste.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux net (Société devise)
 apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Gérer l'arboressence des territoirs.
 DocType: Payment Reconciliation Payment,Sales Invoice,Facture de vente
@@ -2304,7 +2303,7 @@ apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cann
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal
 DocType: Stock Entry,Subcontract,Sous-traiter
 DocType: Production Planning Tool,Get Items From Sales Orders,Obtenir des éléments de Sales Orders
-DocType: Production Order Operation,Actual End Time,Temps réel Fin
+DocType: Production Order Operation,Actual End Time,Fin du temps réel
 DocType: Production Planning Tool,Download Materials Required,Télécharger Matériel requis
 DocType: Item,Manufacturer Part Number,Numéro de pièce du fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Durée et Coût estimatif
@@ -2468,7 +2467,8 @@ DocType: Features Setup,Sales Extras,Extras ventes
 apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Alternative lien de téléchargement
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
 DocType: Leave Allocation,Carry Forwarded Leaves,Effectuer Feuilles Transmises
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',« Date d' 'doit être après « à jour »
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"« Date d' 'doit être après « à jour »
+'Date début' doit être après 'Date fin'"
 ,Stock Projected Qty,Stock projeté Quantité
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
 DocType: Warranty Claim,From Company,De Company
@@ -2515,7 +2515,7 @@ DocType: Stock Settings,Item Naming By,Point de noms en
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,De offre
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
 DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Compte {0} ne existe pas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Le compte {0} ne existe pas
 DocType: Purchase Receipt Item,Purchase Order Item No,Achetez article ordonnance n
 DocType: System Settings,System Settings,Paramètres système
 DocType: Project,Project Type,Type de projet
@@ -2698,7 +2698,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Please enter
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Inscrivez vos têtes d'impôt (par exemple, la TVA , accises , ils doivent avoir des noms uniques ) et leur taux standard."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour objet {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Remarque: Si le paiement ne est pas faite contre toute référence, assurez Journal entrée manuellement."
 DocType: Item,Supplier Items,Fournisseur Articles
@@ -2713,7 +2713,7 @@ DocType: Hub Settings,Publish Availability,Publier Disponibilité
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Date de naissance ne peut pas être supérieure à aujourd'hui.
 ,Stock Ageing,Stock vieillissement
 DocType: Purchase Receipt,Automatically updated from BOM table,Mise à jour automatique de la table BOM
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} {1} 'est désactivée
+apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}' est désactivée
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvrir
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des e-mails automatiques aux contacts sur les transactions Soumission.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +282,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2808,10 +2808,10 @@ DocType: Web Page,Slideshow,Diaporama
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
 DocType: Sales Invoice,Shipping Rule,Livraison règle
 DocType: Journal Entry,Print Heading,Imprimer Cap
-DocType: Quotation,Maintenance Manager,Maintenance Manager
+DocType: Quotation,Maintenance Manager,Responsable de l'entretien
 DocType: Workflow State,Search,Rechercher
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,Arbre de centres de coûts finanial .
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,'Jours après la dernière commande' doit être supérieur ou égale à zéro
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,Brasage
 DocType: C-Form,Amended From,Modifié depuis
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,Matières premières
@@ -2864,7 +2864,7 @@ DocType: Quality Inspection,Report Date,Date du rapport
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Routing,Routage
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Titre de l'emploi
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} bénéficiaires
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} destinataires
 DocType: Features Setup,Item Groups in Details,Groupes d'articles en détails
 apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,Compte de dépenses est obligatoire
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -3061,7 +3061,7 @@ apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citatio
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé
 ,Territory Target Variance Item Group-Wise,Entretien Visitez {0} doit être annulée avant d'annuler cette commande client
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que dossier de change n'est pas créé pour {1} et {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Compte {0}: compte de Parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',Type Nom de la partie
@@ -3169,7 +3169,7 @@ apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,C
 DocType: Batch,Batch ID,Identifiant du lot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
 ,Delivery Note Trends,Bordereau de livraison Tendances
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} doit être un article acheté ou sous-traitées à la ligne {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} doit être un article d'achat ou sous-traitées à la ligne {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,Compte: {0} ne peut être mis à jour via les transactions boursières
 DocType: GL Entry,Party,Intervenants
 DocType: Sales Order,Delivery Date,Date de livraison
@@ -3190,7 +3190,7 @@ DocType: Item,You can enter the minimum quantity of this item to be ordered.,Vou
 DocType: Sales Partner,Partner's Website,Le site web du partenaire
 DocType: Opportunity,To Discuss,Pour discuter
 DocType: SMS Settings,SMS Settings,Paramètres SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes temporaires
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes provisoires
 DocType: Payment Tool,Column Break 1,Saut de colonne 1
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Noir
 DocType: BOM Explosion Item,BOM Explosion Item,Article éclatement de la nomenclature
@@ -3329,7 +3329,7 @@ apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set thi
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuration serveur entrant de soutien id e-mail . (par exemple support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +35,Shortage Qty,Qté non couverte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row{0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
-DocType: Salary Slip,Salary Slip,Glissement des salaires
+DocType: Salary Slip,Salary Slip,Fiche de paye
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Brunissage
 DocType: Features Setup,To enable <b>Point of Sale</b> view,Pour activer <b> point de vente < / b > vue
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,Compte {0} existe déjà
@@ -3421,7 +3421,7 @@ DocType: Salary Slip Deduction,Default Amount,Montant par défaut
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Entrepôt pas trouvé dans le système
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecture d&#39;inspection de la qualité
 DocType: Party Account,col_break1,col_break1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,Fichier source
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Figer les stocks datant de plus` doit être inférieur que %d jours.
 ,Project wise Stock Tracking,Projet sage Stock Tracking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Champ {0} n'est pas sélectionnable.
 DocType: Stock Entry Detail,Actual Qty (at source/target),Quantité réelle (à la source / cible)
@@ -3479,14 +3479,14 @@ DocType: Price List,Price List Name,Nom Liste des Prix
 DocType: Time Log,For Manufacturing,Pour Manufacturing
 DocType: BOM,Manufacturing,Fabrication
 ,Ordered Items To Be Delivered,Articles commandés à livrer
-DocType: Account,Income,Extraire automatiquement les demandeurs d'emploi à partir d'une boîte aux lettres
+DocType: Account,Income,Revenu
 ,Setup Wizard,Assistant de configuration
 DocType: Industry Type,Industry Type,Secteur d&#39;activité
 apps/erpnext/erpnext/templates/includes/cart.js +264,Something went wrong!,Quelque chose se est mal passé!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attention: la demande d&#39;autorisation contient les dates de blocs suivants
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d&#39;achèvement
-DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Société Monnaie)
+DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,Moulage sous pression
 DocType: Email Alert,Reference Date,Date de Référence
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unité d'organisation (département) maître .
@@ -3572,7 +3572,7 @@ DocType: Authorization Rule,Based On,Basé sur
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu&#39;à
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Générer les bulletins de salaire
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,S'il vous plaît sélectionner la valeur de groupe ou Ledger
+apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} n'est pas un identifiant de courriel valide
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifiée, si pour Applicable est sélectionné comme {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
 DocType: ToDo,Low,Bas
@@ -3626,7 +3626,7 @@ apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offre candidat un e
 DocType: Notification Control,Prompt for Email on Submission of,Prompt for Email relative à la présentation des
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Point {0} doit être un stock Article
 apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,Les paramètres par défaut pour les opérations comptables .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} est indispensable
+apps/frappe/frappe/model/naming.py +40,{0} is required,{0} est nécessaire
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Le moulage sous vide
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
 DocType: Contact Us Settings,City,Ville
@@ -3751,7 +3751,7 @@ DocType: Purchase Order,Get Last Purchase Rate,Obtenez Purchase Rate Dernière
 DocType: Company,Company Info,Informations sur l'entreprise
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Seaming,Seaming
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Configuration serveur entrant pour les ventes id e-mail . (par exemple sales@example.com )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
 DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article
 DocType: Fiscal Year,Year Start Date,Date de début Année
 DocType: Attendance,Employee Name,Nom de l&#39;employé
@@ -3824,7 +3824,7 @@ DocType: Project,Gross Margin %,Marge brute%
 DocType: BOM,With Operations,Avec des opérations
 ,Monthly Salary Register,S&#39;enregistrer Salaire mensuel
 apps/frappe/frappe/website/template.py +120,Next,Suivant
-DocType: Warranty Claim,If different than customer address,Point {0} a déjà été renvoyé
+DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electropolishing,Électrolytique
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le montant rangée précédente

erpnext/translations/id.csv

@@ -1000,7 +1000,7 @@ DocType: Lead,Consultant,Konsultan
 DocType: Salary Slip,Earnings,Penghasilan
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktur Penjualan Muka
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Tidak ada yang meminta
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','Aktual Tanggal Mulai' tidak dapat lebih besar dari 'Aktual Tanggal Selesai'
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,Manajemen
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Jenis kegiatan untuk Waktu Sheets
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Investasi casting
@@ -3421,7 +3421,7 @@ DocType: Salary Slip Deduction,Default Amount,Jumlah standar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspeksi Kualitas Reading
 DocType: Party Account,col_break1,col_break1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Saham Lama Dari` harus lebih kecil dari% d hari.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stock yang sudah lebih lama dari` harus lebih kecil dari %d hari.
 ,Project wise Stock Tracking,Project Tracking Stock bijaksana
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Jadwal pemeliharaan {0} ada terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Jumlah Aktual (di sumber/target)

erpnext/translations/pt-BR.csv

@@ -120,7 +120,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not auth
 apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,Pai item {0} não deve ser Stock item e deve ser um item de vendas
 DocType: Item,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Taxa / 60) * Tempo real Operação
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Taxa / 60) * Tempo de operação atual
 DocType: SMS Log,SMS Log,Log de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
 DocType: Blog Post,Guest,Convidado
@@ -1377,7 +1377,7 @@ DocType: Company,Default Payable Account,Conta a Pagar Padrão
 DocType: Party Type,Contacts,Contatos
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,Instalação concluída
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Tida
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Cobrada
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,reservados Qtde
 DocType: Party Account,Party Account,Conta Party
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Recursos Humanos
@@ -1521,7 +1521,7 @@ apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Para Pacote Nº.
 DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Data da Questão
-DocType: Activity Cost,Activity Cost,Atividade Custo
+DocType: Activity Cost,Activity Cost,Custo de atividade
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Telecomunicações
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Projecto)
@@ -2259,7 +2259,7 @@ DocType: Purchase Order Item,Material Request No,Pedido de material no
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base da empresa
 DocType: Purchase Invoice,Discount Amount (Company Currency),Montante Discount (Empresa de moeda)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso a partir desta lista.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
 apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Gerenciar territórios
 DocType: Payment Reconciliation Payment,Sales Invoice,Nota Fiscal de Venda
@@ -2622,7 +2622,7 @@ DocType: Time Log,Will be updated when billed.,Será atualizado quando faturado.
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Rendimentos
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Proferido
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Entregue
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas do Território
@@ -3769,7 +3769,7 @@ apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturas l
 DocType: DocField,Default,Padrão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
 DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Selecionando "Sim" vai permitir que este item apareça na Ordem de Compra, Recibo de Compra."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} assinantes acrescentado
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} assinantes acrescentados
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Account,Parent Account,Conta pai
 DocType: Serial No,Available,Disponível

erpnext/translations/ru.csv

@@ -120,7 +120,7 @@ apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not auth
 apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,Родитель Пункт {0} должен быть не со Пункт и должен быть Продажи товара
 DocType: Item,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оценить / 60) * Фактическая Время работы
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическая время работы
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Стоимость доставленных изделий
 DocType: Blog Post,Guest,Гость
@@ -403,7 +403,7 @@ DocType: Buying Settings,Supplier Name,Наименование поставщи
 DocType: Account,Is Group,Является Группа
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Термоформования
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Продольная резка
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Для дела №"" не может быть меньше, чем ""От дела №"""
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""До Дела №"" не может быть меньше, чем ""От Дела №"""
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,Некоммерческое предприятие
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не начато
 DocType: Lead,Channel Partner,Channel ДУrtner
@@ -553,7 +553,7 @@ DocType: Email Digest,New Enquiries,Новые запросы
 DocType: Employee,Reason for Resignation,Причиной отставки
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Шаблон для аттестации.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Счет / Журнал вступления подробнее
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' не в {2} Фискальном году
+apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' не в {2} Финансовом году
 DocType: Buying Settings,Settings for Buying Module,Настройки для покупки модуля
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Пожалуйста, введите ТОВАРНЫЙ ЧЕК первый"
 DocType: Buying Settings,Supplier Naming By,Поставщик Именование По
@@ -565,7 +565,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,М
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,От купли получении
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметр
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основе"" и ""Группировка по"" не могут быть одинаковыми"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
 DocType: Sales Person,Sales Person Targets,Менеджера по продажам Цели
 sites/assets/js/form.min.js +253,To,для
 apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
@@ -967,13 +967,13 @@ DocType: Supplier,Default Currency,Базовая валюта
 DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
 DocType: Contact Us Settings,Address,Адрес
 DocType: Expense Claim,From Employee,От работника
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1}, не в любом финансовом году. Для получения более подробной проверки {2}."
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} не состоит ни в одном Финансовом году. Для получения подробностей проверьте {2}.
 apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
 DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,Транспортные расходы
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} должны быть отправлены
 DocType: SMS Center,Total Characters,Персонажей
 apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-образный Счет Подробно
@@ -1960,7 +1960,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rat
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} не отправлен
 apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
 DocType: Email Digest,New Communications,Новые Коммуникации
@@ -2467,7 +2467,7 @@ DocType: Features Setup,Sales Extras,Продажи Дополнительно
 apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 DocType: Leave Allocation,Carry Forwarded Leaves,Carry направляются листья
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""С даты"" должно быть после ""До даты"""
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 ,Stock Projected Qty,Фото со Прогнозируемый Количество
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Warranty Claim,From Company,От компании
@@ -2553,7 +2553,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Зв
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Заказ на {0} не представлено
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} вводится более одного раза в пункт Таблица вариантов
+apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} дублируется в Таблице вариантов
 ,Projected,Проектированный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Note: Reference Date exceeds allowed credit days by {0} days for {1} {2},Примечание: Ссылка Дата превышает разрешенный лимит дней по {0} дней для {1} {2}
@@ -2967,7 +2967,7 @@ DocType: GL Entry,Is Advance,Является Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
 apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контактный номер
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Прибыль И Убытки"" Аккаунту типа {0} закрыт доступ на Открытие записи"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
 DocType: Workflow State,Time,Время
 DocType: Features Setup,Sales Discounts,Продажи Купоны
 DocType: Hub Settings,Seller Country,Продавец Страна
@@ -3420,7 +3420,7 @@ DocType: Salary Slip Deduction,Default Amount,По умолчанию колич
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Склад не найден в системе
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль качества Чтение
 DocType: Party Account,col_break1,col_break1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше"" должны быть меньше %d дней."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 ,Project wise Stock Tracking,Проект мудрый слежения со
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактический Кол-во (в источнике / цели)
@@ -3685,7 +3685,7 @@ DocType: DocPerm,Level,Уровень
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""Адрес Email Для Уведомлений"" не указан для повторяющихся %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,Фрезерный
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,Нарезки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административные затраты
@@ -3745,7 +3745,7 @@ apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_u
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддержание же скоростью протяжении цикла продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},Не можете вернуть более {0} для Пункт {1}
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планировать время журналы за пределами рабочего времени рабочих станций.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} уже представлен
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} уже отправлен
 ,Items To Be Requested,"Предметы, будет предложено"
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
@@ -3759,7 +3759,7 @@ apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
 DocType: Purchase Common,Purchase Common,Покупка Common
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} был изменен. Обновите.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,Из возможностей
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Гашение

erpnext/translations/th.csv

@@ -565,7 +565,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,ผ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,จากการรับซื้อ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ไม่ สามารถเดียวกัน
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ต้องไม่เหมือนกัน
 DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
 sites/assets/js/form.min.js +253,To,ไปยัง
 apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,กรุณากรอกอีเมล์

erpnext/translations/zh-tw.csv

@@ -54,7 +54,7 @@ apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,新假期申請
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,銀行匯票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。為了保持客戶明智的項目代碼，並使其搜索根據自己的代碼中使用這個選項
-DocType: Mode of Payment Account,Mode of Payment Account,支付賬戶模式
+DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Show Variants,顯示變體
 DocType: Sales Invoice Item,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（負債）
@@ -231,7 +231,7 @@ DocType: Item,Auto-raise Material Request if quantity goes below re-order level
 DocType: Journal Entry,Write Off Amount <=,核銷金額&lt;=
 DocType: Lead,Address & Contact,地址及聯繫方式
 apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
-DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,創建庫存總帳條目當您提交銷售發票
+DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,當您提交銷貨發票時新增庫存總帳分錄
 DocType: Newsletter List,Total Subscribers,用戶總數
 DocType: Lead,Contact Name,聯繫人姓名
 DocType: Production Plan Item,SO Pending Qty,SO待定數量
@@ -403,15 +403,15 @@ DocType: Buying Settings,Supplier Name,供應商名稱
 DocType: Account,Is Group,是集團
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,熱成型
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,縱剪
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“要案件編號”不能少於&#39;從案號“
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,非營利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未啟動
 DocType: Lead,Channel Partner,渠道合作夥伴
 DocType: Account,Old Parent,老家長
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售經理大師
+DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經理
 apps/erpnext/erpnext/config/manufacturing.py +66,Global settings for all manufacturing processes.,所有製造過程中的全局設置。
-DocType: Accounts Settings,Accounts Frozen Upto,賬戶被凍結到
+DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假日高手。
@@ -521,7 +521,7 @@ apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_ac
 DocType: Backup Manager,Sync with Google Drive,同步與谷歌驅動器
 DocType: Leave Control Panel,Allocate,分配
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,上一筆
-DocType: Stock Entry,Sales Return,銷售退貨
+DocType: Stock Entry,Sales Return,銷貨退回
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,要從創建生產訂單選擇銷售訂單。
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,工資組成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
@@ -820,7 +820,7 @@ apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
 DocType: Purchase Receipt,Range,範圍
-DocType: Supplier,Default Payable Accounts,默認的應付帳款
+DocType: Supplier,Default Payable Accounts,預設應付帳款
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Features Setup,Item Barcode,商品條碼
 apps/erpnext/erpnext/stock/doctype/item/item.py +193,Item Variants {0} updated,項目變種{0}更新
@@ -859,7 +859,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,化學藥品
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
 DocType: Salary Manager,Select Payroll Year and Month,選擇薪資年和月
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的組（通常資金運用&gt;流動資產&gt;銀行帳戶，並創建一個新帳戶（通過點擊添加類型的兒童），“銀行”
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的群組（通常資金運用>流動資產>銀行帳戶，並新增一個新帳戶（通過點擊添加類型的兒童），“銀行”
 DocType: Workstation,Electricity Cost,電力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
 DocType: Comment,Unsubscribed,退訂
@@ -924,7 +924,7 @@ Note: BOM = Bill of Materials","聚合組** **項目到另一個項目** **的
 DocType: Item,Manufacturer,生產廠家
 DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
 DocType: Sales Order,PO Date,訂單日期
-DocType: Serial No,Sales Returned,銷售退回
+DocType: Serial No,Sales Returned,銷貨退回
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,銷售金額
 apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,時間日誌
@@ -1040,7 +1040,7 @@ DocType: Payment Reconciliation,Unreconciled Payment Details,不甘心付款方
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
 DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,“參賽作品”不能為空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
 sites/assets/js/erpnext.min.js +2,"Grid """,電網“
@@ -1310,7 +1310,7 @@ DocType: Top Bar Item,Target,目標
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,貢獻金額
 DocType: Sales Invoice,Shipping Address,送貨地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,在字將是可見的，一旦你保存送貨單。
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存，就會顯示出來。
 apps/erpnext/erpnext/config/stock.py +120,Brand master.,品牌大師。
 DocType: ToDo,Due Date,到期日
 DocType: Sales Invoice Item,Brand Name,商標名稱
@@ -1375,7 +1375,7 @@ DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,任務是強制性的，如果費用報銷是對一個項目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,外購入庫單{0}未提交
-DocType: Company,Default Payable Account,默認情況下應付賬款
+DocType: Company,Default Payable Account,預設應付賬款
 DocType: Party Type,Contacts,往來
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車，如航運規則，價格表等
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,安裝完成
@@ -1493,7 +1493,7 @@ DocType: Communication,Received,收到
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為航運規則的條件
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master",新帳戶的名稱。注：請不要創建帳戶客戶和供應商，它們會自動從客戶和供應商創造大師
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master",新帳戶的名稱。注意：請不要新增客戶和供應商的帳戶，它們會自動從客戶和供應商主檔新增。
 DocType: DocField,Attach Image,附上圖片
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
 DocType: Stock Reconciliation Item,Leave blank if no change,離開，如果沒有變化的空白
@@ -2080,7 +2080,7 @@ DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 sites/assets/js/list.min.js +26,Submitted,提交
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪個時間
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主。
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主檔。
 DocType: Purchase Invoice,Will be calculated automatically when you enter the details,當你輸入詳細信息將自動計算
 DocType: Delivery Note,Transporter lorry number,轉運貨車數量
 DocType: Sales Order,Billing Status,計費狀態
@@ -2189,7 +2189,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,員工{0}於{1}休假。不能標記考勤。
 DocType: Sales Partner,Targets,目標
-DocType: Price List,Price List Master,價格表大師
+DocType: Price List,Price List Master,價格表主檔
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
 ,S.O. No.,SO號
 DocType: Production Order Operation,Make Time Log,讓時間日誌
@@ -2268,9 +2268,9 @@ DocType: Payment Reconciliation Payment,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
 DocType: Sales Invoice Item,Time Log Batch,時間日誌批
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,請選擇適用的折扣
-DocType: Company,Default Receivable Account,默認情況下應收賬款
+DocType: Company,Default Receivable Account,預設應收帳款
-DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,創建銀行進入對支付上述選擇標準，工資總額
+DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
-DocType: Item,Item will be saved by this name in the data base.,項目將通過此名稱在數據庫中保存。
+DocType: Item,Item will be saved by this name in the data base.,項目將以此名稱在資料庫中保存。
 DocType: Stock Entry,Material Transfer for Manufacture,材料轉讓用於製造
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
 DocType: Purchase Invoice,Half-yearly,每半年一次
@@ -2394,7 +2394,7 @@ DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審
 DocType: Pricing Rule,Purchase Manager,採購經理
 DocType: Payment Tool,Payment Tool,支付工具
 DocType: Target Detail,Target Detail,目標詳細信息
-DocType: Sales Order,% of materials billed against this Sales Order,％的嘴對這種銷售訂單物料
+DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已出帳物料的百分比(%)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末進入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折舊
@@ -2406,7 +2406,7 @@ DocType: Purchase Receipt,LR Date,LR日期
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
 DocType: GL Entry,Voucher No,無憑證
 DocType: Leave Allocation,Leave Allocation,排假
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,'更新庫存“的銷售發票{0}必須設置
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,銷貨發票的'更新庫存'{0}必須設定
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,{0}材料需求創建
 apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,模板條款或合同。
 DocType: Employee,Feedback,反饋
@@ -2456,7 +2456,7 @@ DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 DocType: Purchase Invoice,Total Amount To Pay,支付總計
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
 DocType: Event,Groups,組
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,已帳戶群組
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,以帳戶分群組
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,較低的收入
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",根據責任賬號頭，其中利潤/虧損將被黃牌警告
@@ -2588,7 +2588,7 @@ DocType: Sales Invoice Item,Delivered Qty,交付數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
 DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,同時接收或傳送資料被允許在數量上的變化百分比。
 DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,購物車稅費碩士
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",轉到相應的組（通常基金&gt;流動負債&gt;稅和關稅的來源，並創建一個新帳戶（通過點擊輸入“稅”添加兒童），做提稅率。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",轉到相應的群組（通常基金>流動負債>稅和關稅的來源，並新增一個新帳戶（通過點擊輸入“稅”添加兒童），做提稅率。
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +113,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Laser cutting,激光切割
@@ -2695,7 +2695,7 @@ DocType: Company,Default Cash Account,默認的現金賬戶
 apps/erpnext/erpnext/config/setup.py +91,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Please enter 'Expected Delivery Date',請輸入「預定交付日」
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的頭稅（如增值稅，消費稅，他們應該有唯一的名稱）及其標準費率。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
@@ -2917,7 +2917,7 @@ apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Finan
 DocType: Opportunity,Sales,銷售
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},需要現貨產品倉庫{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Cr,鉻
-DocType: Customer,Default Receivable Accounts,默認應收賬款
+DocType: Customer,Default Receivable Accounts,預設應收帳款
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Sawing,鋸切
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Laminating,層壓
 DocType: Item Reorder,Transfer,轉讓
@@ -2974,7 +2974,7 @@ DocType: Hub Settings,Seller Country,賣家國家
 DocType: Authorization Rule,Authorization Rule,授權規則
 DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
 apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,產品規格
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用模板
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,服裝及配飾
 DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.",如果股票的強制性項目為“是”。也是默認倉庫，保留數量從銷售訂單設置。
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,訂購數量
@@ -3049,7 +3049,7 @@ apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be
 DocType: Item Attribute Value,Abbreviation,縮寫
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Rotational molding,滾塑成型
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪資模板大師。
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪資套版主檔。
 DocType: Leave Type,Max Days Leave Allowed,允許的最長休假天
 DocType: Payment Tool,Set Matching Amounts,設置相同的金額
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
@@ -3331,7 +3331,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row{0}:
 DocType: Salary Slip,Salary Slip,工資單
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,打磨
 DocType: Features Setup,To enable <b>Point of Sale</b> view,為了使<b>銷售點</b>看法
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“至今”是必需的
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成裝箱單的包裹交付。用於通知包號，包的內容和它的重量。
 DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
 DocType: Salary Slip,Payment Days,付款日
@@ -3463,7 +3463,7 @@ apps/erpnext/erpnext/templates/includes/footer_extension.html +9,Stay Updated,
 apps/erpnext/erpnext/stock/doctype/item/item.py +376,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +66,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Electron beam machining,電子束加工
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購經理大師
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,生產訂單{0}必須提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +160,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
 apps/erpnext/erpnext/config/stock.py +141,Main Reports,主報告
@@ -3552,7 +3552,7 @@ apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,
 DocType: Stock Entry,Default Source Warehouse,默認信號源倉庫
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +203,Birthday Reminder for {0},生日提醒{0}
-DocType: Item,Default Purchase Account in which cost of the item will be debited.,默認帳戶購買該項目的成本將被扣除。
+DocType: Item,Default Purchase Account in which cost of the item will be debited.,預設帳戶購買該項目的成本將被扣除。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Lapping,精研
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,天自上次訂購
 DocType: Buying Settings,Naming Series,命名系列
@@ -3572,7 +3572,7 @@ DocType: Stock Settings,Stock Frozen Upto,股票凍結到...為止
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動／任務。
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工資條
 apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0}不是一個有效的電子郵件ID
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",求購必須進行檢查，如果適用於被選擇為{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
 DocType: ToDo,Low,低
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Spinning,紡織
@@ -3813,7 +3813,7 @@ DocType: Stock Entry,Default Target Warehouse,默認目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
 DocType: Notification Control,Purchase Receipt Message,外購入庫單信息
 DocType: Production Order,Actual Start Date,實際開始日期
-DocType: Sales Order,% of materials delivered against this Sales Order,％的交付對這個銷售訂單物料
+DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
 apps/erpnext/erpnext/config/stock.py +18,Record item movement.,記錄項目移動。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通訊訂戶名單
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Morticing

erpnext/utilities/doctype/address/address.json

@@ -112,7 +112,7 @@
   }, 
   {
    "default": "0", 
-   "description": "Check to make primary address", 
+   "description": "", 
    "fieldname": "is_primary_address", 
    "fieldtype": "Check", 
    "label": "Preferred Billing Address", 
@@ -120,7 +120,7 @@
   }, 
   {
    "default": "0", 
-   "description": "Check to make Shipping Address", 
+   "description": "", 
    "fieldname": "is_shipping_address", 
    "fieldtype": "Check", 
    "in_list_view": 0, 
@@ -199,7 +199,7 @@
  "icon": "icon-map-marker", 
  "idx": 1, 
  "in_dialog": 0, 
- "modified": "2015-02-20 05:07:56.567822", 
+ "modified": "2015-06-01 06:42:18.331818", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address", 

erpnext/utilities/doctype/address/address.py

@@ -84,5 +84,24 @@ def get_territory_from_address(address):
 
 	return territory
 
+def get_list_context(context=None):
+	from erpnext.shopping_cart.cart import get_address_docs
+	return {
+		"title": _("My Addresses"),
+		"get_list": get_address_docs,
+		"row_template": "templates/includes/address_row.html",
+	}
+
+def has_website_permission(doc, ptype, user, verbose=False):
+	"""Returns true if customer or lead matches with user"""
+	customer = frappe.db.get_value("Contact", {"email_id": frappe.session.user}, "customer")
+	if customer:
+		return doc.customer == customer
+	else:
+		lead = frappe.db.get_value("Lead", {"email_id": frappe.session.user})
+		if lead:
+			return doc.lead == lead
+
+	return False
 
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.0.15"
+version = "5.0.16"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()