diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index eea2e47..452b9e8 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.46'
+__version__ = '8.0.48'
 
 
 def get_default_company(user=None):
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 0f0569a..f61931a 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -198,7 +198,7 @@
 		customers = [frappe._dict({'name': customers})]
 
 	for data in customers:
-		contact = frappe.db.sql(""" select email_id, phone from `tabContact` 
+		contact = frappe.db.sql(""" select email_id, phone, mobile_no from `tabContact` 
 			where is_primary_contact =1 and name in
 			(select parent from `tabDynamic Link` where link_doctype = 'Customer' and link_name = %s
 			and parenttype = 'Contact')""", data.name, as_dict=1)
@@ -320,6 +320,7 @@
 				si_doc = frappe.new_doc('Sales Invoice')
 				si_doc.offline_pos_name = name
 				si_doc.update(doc)
+				si_doc.set_posting_time = 1
 				si_doc.customer = get_customer_id(doc)
 				si_doc.due_date = doc.get('posting_date')
 				submit_invoice(si_doc, name, doc)
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index 606d067..36f4221 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -7,7 +7,7 @@
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils import cstr, cint
-from frappe.geo.doctype.address.address import get_default_address
+from frappe.contacts.doctype.address.address import get_default_address
 
 class IncorrectCustomerGroup(frappe.ValidationError): pass
 class IncorrectSupplierType(frappe.ValidationError): pass
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index b2da89a35..668b4c3 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -717,7 +717,7 @@
 					item = this.get_item(item.value);
 					var searchtext =
 						Object.keys(item)
-							.filter(key => ['customer_name', 'customer_group', 'value', 'label', 'email_id', 'phone'].includes(key))
+							.filter(key => ['customer_name', 'customer_group', 'value', 'label', 'email_id', 'phone', 'mobile_no'].includes(key))
 							.map(key => item[key])
 							.join(" ")
 							.toLowerCase();
@@ -795,6 +795,7 @@
 				customer_group: c.customer_group,
 				territory: c.territory,
 				phone: contact ? contact["phone"] : '',
+				mobile_no: contact ? contact["mobile_no"] : '',
 				email_id: contact ? contact["email_id"] : ''
 			}
 		});
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index a6ca3b6..5c6a6df 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -9,8 +9,8 @@
 from frappe.defaults import get_user_permissions
 from frappe.utils import add_days, getdate, formatdate, get_first_day, date_diff, \
 	add_years, get_timestamp, nowdate, flt
-from frappe.geo.doctype.address.address import get_address_display, get_default_address
-from frappe.email.doctype.contact.contact import get_contact_details, get_default_contact
+from frappe.contacts.doctype.address.address import get_address_display, get_default_address
+from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
 from erpnext.exceptions import PartyFrozen, InvalidCurrency, PartyDisabled, InvalidAccountCurrency
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext import get_default_currency
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index ba847c0..390bb27 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -21,11 +21,13 @@
 				<th style="width: 40%">{%= __("Party") %}</th>
 				<th style="width: 15%">{%= __("Invoiced Amount") %}</th>
 				<th style="width: 15%">{%= __("Paid Amount") %}</th>
+				<th style="width: 15%">{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %}</th>
 				<th style="width: 15%">{%= __("Outstanding Amount") %}</th>
 			{% } else { %}
 				<th style="width: 40%">{%= __("Party") %}</th>
 				<th style="width: 15%">{%= __("Total Invoiced Amount") %}</th>
 				<th style="width: 15%">{%= __("Total Paid Amount") %}</th>
+				<th style="width: 15%">{%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %}</th>
 				<th style="width: 15%">{%= __("Total Outstanding Amount") %}</th>
 			{% } %}
 		</tr>
@@ -45,6 +47,8 @@
 					<td style="text-align: right">
 						{%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
 					<td style="text-align: right">
+						{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"])  %}</td>
+					<td style="text-align: right">
 						{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td>
 				{% } else { %}
 					<td></td>
@@ -54,6 +58,7 @@
 						{%= format_currency(data[i]["Invoiced Amount"]) %}</td>
 					<td style="text-align: right">
 						{%= format_currency(data[i]["Paid Amount"]) %}</td>
+					<td style="text-align: right">{% report.report_name === "Accounts Receivable" ? format_currency(data[i][__("Credit Note Amt")])  : format_currency(data[i][__("Debit Note Amt")])  %} </td>
 					<td style="text-align: right">
 						{%= format_currency(data[i]["Outstanding Amount"]) %}</td>
 				{% } %}
@@ -67,6 +72,7 @@
 					{% } %}
 					<td style="text-align: right">{%= format_currency(data[i][__("Total Invoiced Amt")]) %}</td>
 					<td style="text-align: right">{%= format_currency(data[i][__("Total Paid Amt")]) %}</td>
+					<td style="text-align: right">{%= report.report_name === "Accounts Receivable Summary" ? format_currency(data[i][__("Credit Note Amt")]) : format_currency(data[i][__("Debit Note Amt")]) %}</td>
 					<td style="text-align: right">{%= format_currency(data[i][__("Total Outstanding Amt")]) %}</td>
 				{% } %}
 			{% } %}
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
index 81bcccb..845a2c5 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -17,9 +17,11 @@
 		if party_naming_by == "Naming Series":
 			columns += [ args.get("party_type") + " Name::140"]
 
+		credit_debit_label = _("Credit Note Amt") if args.get('party_type') == 'Customer' else _("Debit Note Amt")
 		columns += [
 			_("Total Invoiced Amt") + ":Currency/currency:140",
 			_("Total Paid Amt") + ":Currency/currency:140",
+			credit_debit_label + ":Currency/currency:140",
 			_("Total Outstanding Amt") + ":Currency/currency:160",
 			"0-" + str(self.filters.range1) + ":Currency/currency:100",
 			str(self.filters.range1) + "-" + str(self.filters.range2) + ":Currency/currency:100",
@@ -56,7 +58,7 @@
 				row += [self.get_party_name(args.get("party_type"), party)]
 
 			row += [
-				party_dict.invoiced_amt, party_dict.paid_amt, party_dict.outstanding_amt,
+				party_dict.invoiced_amt, party_dict.paid_amt, party_dict.credit_amt, party_dict.outstanding_amt,
 				party_dict.range1, party_dict.range2, party_dict.range3, party_dict.range4,
 			]
 
@@ -77,6 +79,7 @@
 				frappe._dict({
 					"invoiced_amt": 0,
 					"paid_amt": 0,
+					"credit_amt": 0,
 					"outstanding_amt": 0,
 					"range1": 0,
 					"range2": 0,
@@ -104,7 +107,7 @@
 		if args.get("party_type") == "Supplier":
 			cols += ["bill_no", "bill_date"]
 
-		cols += ["invoiced_amt", "paid_amt",
+		cols += ["invoiced_amt", "paid_amt", "credit_amt",
 		"outstanding_amt", "age", "range1", "range2", "range3", "range4", "currency"]
 
 		if args.get("party_type") == "Supplier":
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
index 50382d5..df10a54 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -10,7 +10,7 @@
 		'internal_links': {
 			'Material Request': ['items', 'material_request'],
 			'Supplier Quotation': ['items', 'supplier_quotation'],
-			'Project': ['project'],
+			'Project': ['items', 'project'],
 		},
 		'transactions': [
 			{
@@ -30,4 +30,4 @@
 				'items': ['Stock Entry']
 			}
 		]
-	}
\ No newline at end of file
+	}
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index c7df33d..7fae7b9 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -25,12 +25,12 @@
 		}
 
 		if (frm.doc.__islocal) {
-			hide_field(['address_html', 'contact_html']);
-			frappe.geo.clear_address_and_contact(frm);
+			hide_field(['address_html','contact_html']);
+			frappe.contacts.clear_address_and_contact(frm);
 		}
 		else {
-			unhide_field(['address_html', 'contact_html']);
-			frappe.geo.render_address_and_contact(frm);
+			unhide_field(['address_html','contact_html']);
+			frappe.contacts.render_address_and_contact(frm);
 
 			// custom buttons
 			frm.add_custom_button(__('Accounting Ledger'), function () {
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 3b6ae62..b2b9063 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -6,7 +6,7 @@
 import frappe.defaults
 from frappe import msgprint, _
 from frappe.model.naming import make_autoname
-from frappe.geo.address_and_contact import load_address_and_contact, delete_contact_and_address
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
 
diff --git a/erpnext/commands/__init__.py b/erpnext/commands/__init__.py
new file mode 100644
index 0000000..6ffa6a3
--- /dev/null
+++ b/erpnext/commands/__init__.py
@@ -0,0 +1,45 @@
+# Copyright (c) 2015, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals, absolute_import, print_function
+import click
+import frappe
+from frappe.commands import pass_context, get_site
+
+def call_command(cmd, context):
+	return click.Context(cmd, obj=context).forward(cmd)
+
+@click.command('make-demo')
+@click.option('--site', help='site name')
+@click.option('--domain', default='Manufacturing')
+@click.option('--days', default=100,
+	help='Run the demo for so many days. Default 100')
+@click.option('--resume', default=False, is_flag=True,
+	help='Continue running the demo for given days')
+@pass_context
+def make_demo(context, site, domain='Manufacturing', days=100, resume=False):
+	"Reinstall site and setup demo"
+	from frappe.commands.site import _reinstall
+	from frappe.installer import install_app
+
+	site = get_site(context)
+
+	if resume:
+		with frappe.init_site(site):
+			frappe.connect()
+			from erpnext.demo import demo
+			demo.simulate(days=days)
+	else:
+		_reinstall(site, yes=True)
+		with frappe.init_site(site=site):
+			frappe.connect()
+			if not 'erpnext' in frappe.get_installed_apps():
+				install_app('erpnext')
+
+			# import needs site
+			from erpnext.demo import demo
+			demo.make(domain, days)
+
+commands = [
+	make_demo
+]
\ No newline at end of file
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 36aa186..f2f3937 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -35,10 +35,10 @@
 			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 
-		if(!doc.__islocal) {
-			frappe.geo.render_address_and_contact(cur_frm);
+		if(!this.frm.doc.__islocal) {
+			frappe.contacts.render_address_and_contact(cur_frm);
 		} else {
-			frappe.geo.clear_address_and_contact(cur_frm);
+			frappe.contacts.clear_address_and_contact(cur_frm);
 		}
 	},
 
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 17c4022..21d1024 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -76,6 +77,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "salutation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salutation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salutation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lead_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -106,21 +137,21 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company_name", 
-   "fieldtype": "Data", 
+   "fieldname": "gender", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Organization Name", 
+   "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "company_name", 
-   "oldfieldtype": "Data", 
+   "options": "Gender", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -259,6 +290,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "company_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Organization Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.source == 'Existing Customer'", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
@@ -1037,6 +1098,7 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-user", 
@@ -1044,15 +1106,15 @@
  "image_field": "image", 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-22 18:53:16.231035", 
+ "modified": "2017-04-10 13:06:36.324439", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Lead", 
+ "name_case": "Title Case", 
  "owner": "Administrator", 
  "permissions": [
   {
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index aafc128..256e3a8 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -8,7 +8,7 @@
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.controllers.selling_controller import SellingController
-from frappe.geo.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import load_address_and_contact
 from erpnext.accounts.party import set_taxes
 
 sender_field = "email_id"
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index a270e05..9fde264 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -22,7 +22,7 @@
 
 """
 
-def make(domain='Manufacturing'):
+def make(domain='Manufacturing', days=100):
 	frappe.flags.domain = domain
 	frappe.flags.mute_emails = True
 	setup_data.setup(domain)
@@ -36,16 +36,17 @@
 	frappe.init(site)
 	frappe.connect()
 
-	simulate(domain)
+	simulate(domain, days)
 
-def simulate(domain='Manufacturing'):
-	runs_for = frappe.flags.runs_for or 150
+def simulate(domain='Manufacturing', days=100):
+	runs_for = frappe.flags.runs_for or days
 	frappe.flags.company = erpnext.get_default_company()
 	frappe.flags.mute_emails = True
 
 	if not frappe.flags.start_date:
 		# start date = 100 days back
-		frappe.flags.start_date = frappe.utils.add_days(frappe.utils.nowdate(), -1 * runs_for)
+		frappe.flags.start_date = frappe.utils.add_days(frappe.utils.nowdate(),
+			-1 * runs_for)
 
 	current_date = frappe.utils.getdate(frappe.flags.start_date)
 
diff --git a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
index 52b613b..a379ec8 100644
--- a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
@@ -15,6 +15,4 @@
 
 Wenn Sie Ihre Lieferanten in verschiedene Typen unterteilen, erleichtert Ihnen das die Buchhaltung und die Rechnungslegung.
 
-Geben Sie Ihre neue Lieferantenkategorie ein und speichern Sie.
-
-{next}
+Geben Sie Ihre neue Lieferantenkategorie ein und speichern Sie.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
index 5bd2901..540d5cb 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
@@ -3,8 +3,8 @@
 
 	frappe.ui.form.on("Event", "validate", function(frm) {
         if (frm.doc.from_date < get_today()) {
-            msgprint(__("You can not select past date in From Date"));
-            throw "past date selected"
+            frappe.msgprint(__("You can not select past date in From Date"));
+            frappe.throw(__("past date selected"))
         }
 	});
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
index d445a65..9e5ab13 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
@@ -4,12 +4,12 @@
 Fügen Sie dem Ereignis custom_before_cancel eine Steuerungsfunktion hinzu:
 
     cur_frm.cscript.custom_before_cancel = function(doc) {
-        if (user_roles.indexOf("Accounts User")!=-1 && user_roles.indexOf("Accounts Manager")==-1
+        if (frappe.user_roles.indexOf("Accounts User")!=-1 && frappe.user_roles.indexOf("Accounts Manager")==-1
                 && user_roles.indexOf("System Manager")==-1) {
             if (flt(doc.grand_total) > 10000) {
-                msgprint("You can not cancel this transaction, because grand total \
+                frappe.msgprint("You can not cancel this transaction, because grand total \
                     is greater than 10000");
-                validated = false;
+                frappe.validated = false;
             }
         }
     }
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
index bb925e1..a1cb769 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
@@ -3,8 +3,8 @@
 
     frappe.ui.form.on("Material Request", "validate", function(frm) {
         if(user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
-            msgprint("You are only allowed Material Receipt");
-            throw "Not allowed";
+            frappe.msgprint("You are only allowed Material Receipt");
+            frappe.throw(__("Not allowed"));
         }
     }
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
index db725f2..652409f 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
@@ -3,17 +3,16 @@
 
     // restrict certain warehouse to Material Manager
     cur_frm.cscript.custom_validate = function(doc) {
-        if(user_roles.indexOf("Material Manager")==-1) {
-
-            var restricted_in_source = wn.model.get("Stock Entry Detail",
+        if(frappe.user_roles.indexOf("Material Manager")==-1) {
+            var restricted_in_source = frappe.model.get_list("Stock Entry Detail", 
                 {parent:cur_frm.doc.name, s_warehouse:"Restricted"});
 
-            var restricted_in_target = wn.model.get("Stock Entry Detail",
-                {parent:cur_frm.doc.name, t_warehouse:"Restricted"})
+            var restricted_in_target = frappe.model.get_list("Stock Entry Detail", 
+                {parent:cur_frm.doc.name, t_warehouse:"Restricted"});
 
             if(restricted_in_source.length || restricted_in_target.length) {
-                msgprint("Only Material Manager can make entry in Restricted Warehouse");
-                validated = false;
+                frappe.msgprint(__("Only Material Manager can make entry in Restricted Warehouse"));
+                frappe.validated = false;
             }
         }
     }
diff --git a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
index e04def5..c793463 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
@@ -13,6 +13,4 @@
 
 Um mehrere Datensätze umzubenennen, laden Sie eine CSV-Datei mit den alten Namen in der ersten Spalte und den neuen Namen in der zweiten Spalte hoch indem Sie auf "Hochladen" klicken.
 
-<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
-
-{next}
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
index 61f65fa..2e88601 100644
--- a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -23,6 +23,4 @@
 Classifying your supplier into different types facilitates accounting and
 payments.
 
-Type your new supplier category and Save.
-
-{next}
+Type your new supplier category and Save.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
index d68ab56..6e560cb 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
@@ -3,8 +3,8 @@
 
 	frappe.ui.form.on("Task", "validate", function(frm) {
         if (frm.doc.from_date < get_today()) {
-            msgprint(__("You can not select past date in From Date"));
-            validated = false;
+            frappe.msgprint(__("You can not select past date in From Date"));
+            frappe.validated = false;
         }
 	});
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
index e5037fe..79fe9a5 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
@@ -3,12 +3,12 @@
 
 
     cur_frm.cscript.custom_before_cancel = function(doc) {
-        if (user_roles.indexOf("Accounts User")!=-1 && user_roles.indexOf("Accounts Manager")==-1
+        if (frappe.user_roles.indexOf("Accounts User")!=-1 && frappe.user_roles.indexOf("Accounts Manager")==-1
                 && user_roles.indexOf("System Manager")==-1) {
             if (flt(doc.grand_total) > 10000) {
-                msgprint("You can not cancel this transaction, because grand total \
+                frappe.msgprint("You can not cancel this transaction, because grand total \
                     is greater than 10000");
-                validated = false;
+                frappe.validated = false;
             }
         }
     }
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
index 9b37eb5..f3efd98 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
@@ -1,8 +1,8 @@
 
     frappe.ui.form.on("Material Request", "validate", function(frm) {
-        if(user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
-            msgprint("You are only allowed Material Receipt");
-            throw "Not allowed";
+        if(frappe.user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
+            frappe.msgprint("You are only allowed Material Receipt");
+            frappe.throw(__("Not allowed"));
         }
     }
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
index 6c36a14..849e686 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
@@ -1,16 +1,16 @@
 
     // restrict certain warehouse to Material Manager
     cur_frm.cscript.custom_validate = function(doc) {
-        if(user_roles.indexOf("Material Manager")==-1) {
+        if(frappe.user_roles.indexOf("Material Manager")==-1) {
 
-            var restricted_in_source = wn.model.get("Stock Entry Detail",
+            var restricted_in_source = frappe.model.get_list("Stock Entry Detail",
                 {parent:cur_frm.doc.name, s_warehouse:"Restricted"});
 
-            var restricted_in_target = wn.model.get("Stock Entry Detail",
+            var restricted_in_target = frappe.model.get_list("Stock Entry Detail",
                 {parent:cur_frm.doc.name, t_warehouse:"Restricted"})
 
             if(restricted_in_source.length || restricted_in_target.length) {
-                msgprint("Only Material Manager can make entry in Restricted Warehouse");
+                frappe.msgprint(__("Only Material Manager can make entry in Restricted Warehouse"));
                 validated = false;
             }
         }
diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
index d4cb0ba..e1c8b13 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -12,6 +12,4 @@
 
 To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
 
-<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
-
-{next}
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
index 3378b2d..a753358 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -22,4 +22,6 @@
 
 ![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) 
 
+{next}
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/report-builder.md b/erpnext/docs/user/videos/learn/report-builder.md
index 72fdc25..f661120 100644
--- a/erpnext/docs/user/videos/learn/report-builder.md
+++ b/erpnext/docs/user/videos/learn/report-builder.md
@@ -1,7 +1,7 @@
 # Report Builder
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ECRyhMvIf6Q" frameborder="0" allowfullscreen></iframe>
 
 **Duration: 4:27**
 
-This tutorial covers creating custom reports in ERPNext using Report Builder.
\ No newline at end of file
+This tutorial covers creating custom reports in ERPNext using Report Builder.
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index d64409d..b8abd8a 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -146,7 +146,7 @@
 		"on_cancel": "erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty"
 	},
 	"User": {
-		"after_insert": "frappe.email.doctype.contact.contact.update_contact",
+		"after_insert": "frappe.contacts.doctype.contact.contact.update_contact",
 		"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",
 		"on_update": ["erpnext.hr.doctype.employee.employee.update_user_permissions",
 			"erpnext.portal.utils.set_default_role"]
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index c53e497..f32a056 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -106,7 +106,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "salutation", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -119,7 +119,7 @@
    "no_copy": 0, 
    "oldfieldname": "salutation", 
    "oldfieldtype": "Select", 
-   "options": "\nMr\nMs", 
+   "options": "Salutation", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -404,7 +404,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "gender", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -417,7 +417,7 @@
    "no_copy": 0, 
    "oldfieldname": "gender", 
    "oldfieldtype": "Select", 
-   "options": "\nMale\nFemale\nOther", 
+   "options": "Gender",
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -2353,10 +2353,11 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-03-14 17:04:27.247238", 
+ "modified": "2017-07-10 13:08:15.826832", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
+ "name_case": "Title Case", 
  "owner": "Administrator", 
  "permissions": [
   {
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3502d63..fbd04a1 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -400,3 +400,4 @@
 erpnext.patches.v8_0.delete_schools_depricated_doctypes
 erpnext.patches.v8_0.update_customer_pos_id
 erpnext.patches.v8_0.rename_items_in_status_field_of_material_request
+erpnext.patches.v8_0.delete_bin_indexes
diff --git a/erpnext/patches/v8_0/delete_bin_indexes.py b/erpnext/patches/v8_0/delete_bin_indexes.py
new file mode 100644
index 0000000..12cacdb
--- /dev/null
+++ b/erpnext/patches/v8_0/delete_bin_indexes.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	# delete bin indexes
+	unwanted_indexes = ["item_code", "warehouse"]
+
+	for k in unwanted_indexes:
+		try:
+			frappe.db.sql("drop index {0} on `tabBin`".format(k))
+		except:
+			pass
\ No newline at end of file
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 06e759f..d46e9da 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -24,7 +24,7 @@
 			this.frm.set_query("shipping_address", function() {
 				if(me.frm.doc.customer) {
 					return {
-						query: 'frappe.geo.doctype.address.address.address_query',
+						query: 'frappe.contacts.doctype.address.address.address_query',
 						filters: { link_doctype: 'Customer', link_name: me.frm.doc.customer }
 					};
 				} else
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index bf7143a..38f89a4 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -50,7 +50,7 @@
 			}
 
 			return {
-				query: 'frappe.email.doctype.contact.contact.contact_query',
+				query: 'frappe.contacts.doctype.contact.contact.contact_query',
 				filters: { link_doctype: frappe.dynamic_link.doctype, link_name: doc[frappe.dynamic_link.fieldname] } };
 		}
 	},
@@ -63,14 +63,14 @@
 			}
 
 			return {
-				query: 'frappe.geo.doctype.address.address.address_query',
+				query: 'frappe.contacts.doctype.address.address.address_query',
 				filters: { link_doctype: frappe.dynamic_link.doctype, link_name: doc[frappe.dynamic_link.fieldname] } };
 		}
 	},
 
 	company_address_query: function(doc) {
 		return {
-			query: 'frappe.geo.doctype.address.address.address_query',
+			query: 'frappe.contacts.doctype.address.address.address_query',
 			filters: { is_your_company_address: 1, link_doctype: 'Company', link_name: doc.company || '' }
 		};
 	},
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 751d93c..cc19a11 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -80,7 +80,7 @@
 	if(!display_field) display_field = "address_display";
 	if(frm.doc[address_field]) {
 		frappe.call({
-			method: "frappe.geo.doctype.address.address.get_address_display",
+			method: "frappe.contacts.doctype.address.address.get_address_display",
 			args: {"address_dict": frm.doc[address_field] },
 			callback: function(r) {
 				if(r.message) {
@@ -144,7 +144,7 @@
 
 	if(frm.doc["contact_person"]) {
 		frappe.call({
-			method: "frappe.email.doctype.contact.contact.get_contact_details",
+			method: "frappe.contacts.doctype.contact.contact.get_contact_details",
 			args: {contact: frm.doc.contact_person },
 			callback: function(r) {
 				if(r.message)
@@ -166,7 +166,7 @@
 
 erpnext.utils.get_shipping_address = function(frm, callback){
 	frappe.call({
-		method: "frappe.geo.doctype.address.address.get_shipping_address",
+		method: "frappe.contacts.doctype.address.address.get_shipping_address",
 		args: {company: frm.doc.company},
 		callback: function(r){
 			if(r.message){
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
index 91f6c36..1e79a93 100644
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
@@ -61,7 +61,7 @@
 	students_with_leave_application = get_students_with_leave_application(from_date, to_date, students_list)
 	for d in attendance_list:
 		att_map.setdefault(d.student, frappe._dict()).setdefault(d.date, "")
-		if students_with_leave_application and d.student in students_with_leave_application.get(d.date):
+		if students_with_leave_application.get(d.date) and d.student in students_with_leave_application.get(d.date):
 			att_map[d.student][d.date] = "Present"
 		else:
 			att_map[d.student][d.date] = d.status
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 540ec28..d85f5c1 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -37,7 +37,7 @@
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
 		if(!frm.doc.__islocal) {
-			frappe.geo.render_address_and_contact(frm);
+			frappe.contacts.render_address_and_contact(frm);
 
 			// custom buttons
 			frm.add_custom_button(__('Accounting Ledger'), function() {
@@ -53,7 +53,7 @@
 			erpnext.utils.set_party_dashboard_indicators(frm);
 
 		} else {
-			frappe.geo.clear_address_and_contact(frm);
+			frappe.contacts.clear_address_and_contact(frm);
 		}
 
 		var grid = cur_frm.get_field("sales_team").grid;
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 8157013..b2d4021 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -78,6 +78,36 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salutation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salutation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salutation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
@@ -112,6 +142,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "gender", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Gender", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index c0b3b84..3b9d675 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -9,8 +9,8 @@
 from frappe.utils import flt, cint, cstr
 from frappe.desk.reportview import build_match_conditions
 from erpnext.utilities.transaction_base import TransactionBase
-from frappe.geo.address_and_contact import load_address_and_contact, delete_contact_and_address
-from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
+from erpnext.accounts.party import validate_party_accounts, get_dashboard_info # keep this
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 
 class Customer(TransactionBase):
 	def get_feed(self):
@@ -88,11 +88,18 @@
 					address.append('links', dict(link_doctype='Customer', link_name=self.name))
 					address.save()
 
-			lead = frappe.db.get_value("Lead", self.lead_name, ["lead_name", "email_id", "phone", "mobile_no"], as_dict=True)
+			lead = frappe.db.get_value("Lead", self.lead_name, ["lead_name", "email_id", "phone", "mobile_no", "gender", "salutation"], as_dict=True)
+
+			lead.lead_name = lead.lead_name.split(" ")
+			lead.first_name = lead.lead_name[0]
+			lead.last_name = " ".join(lead.lead_name[1:])
 
 			# create contact from lead
 			contact = frappe.new_doc('Contact')
-			contact.first_name = lead.lead_name
+			contact.first_name = lead.first_name
+			contact.last_name = lead.last_name
+			contact.gender = lead.gender
+			contact.salutation = lead.salutation
 			contact.email_id = lead.email_id
 			contact.phone = lead.phone
 			contact.mobile_no = lead.mobile_no
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 84cf749..b1c18d6 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -7,11 +7,11 @@
 
 		if(frm.doc.__islocal){
 			hide_field(['address_html', 'contact_html', 'address_contacts']);
-			frappe.geo.clear_address_and_contact(frm);
+			frappe.contacts.clear_address_and_contact(frm);
 		}
 		else{
 			unhide_field(['address_html', 'contact_html', 'address_contacts']);
-			frappe.geo.render_address_and_contact(frm);
+			frappe.contacts.render_address_and_contact(frm);
 		}
 	}
 });
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
index 96211af..e6b26ee 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.py
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.py
@@ -5,7 +5,7 @@
 import frappe
 from frappe.utils import cstr, filter_strip_join
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.geo.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class SalesPartner(WebsiteGenerator):
 	website = frappe._dict(
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 66e9f4c..e73734e 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -6,7 +6,7 @@
 from frappe import throw, _
 import frappe.defaults
 from frappe.utils import cint, flt, get_fullname, cstr
-from frappe.geo.doctype.address.address import get_address_display
+from frappe.contacts.doctype.address.address import get_address_display
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings
 from frappe.utils.nestedset import get_root_of
 from erpnext.accounts.utils import get_account_name
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 0481cfc..1f6e9e1 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "BIN/.#######", 
@@ -12,6 +13,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -22,6 +24,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Warehouse", 
@@ -37,11 +40,12 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -52,6 +56,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -67,11 +72,12 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -83,6 +89,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Reserved Quantity", 
@@ -102,6 +109,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -113,6 +121,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Actual Quantity", 
@@ -132,6 +141,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -143,6 +153,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Ordered Quantity", 
@@ -162,6 +173,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -173,6 +185,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Requested Quantity", 
@@ -192,6 +205,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -202,6 +216,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Planned Qty", 
@@ -221,6 +236,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -231,6 +247,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Projected Qty", 
@@ -250,6 +267,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -260,6 +278,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Reserved Qty for Production", 
@@ -278,6 +297,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -288,6 +308,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Moving Average Rate", 
@@ -307,6 +328,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -317,6 +339,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "UOM", 
@@ -337,6 +360,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -347,6 +371,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "FCFS Rate", 
@@ -366,6 +391,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -376,6 +402,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Valuation Rate", 
@@ -395,6 +422,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -405,6 +433,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Stock Value", 
@@ -424,17 +453,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 1, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:51:43.312590", 
+ "modified": "2017-06-13 13:06:32.601505", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Bin", 
@@ -450,7 +479,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -471,7 +499,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -492,7 +519,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -508,6 +534,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_code,warehouse", 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index ece8220..75510de 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -31,6 +31,7 @@
 		is_group_warehouse(self.warehouse)
 
 	def update_stock(self, args, allow_negative_stock=False, via_landed_cost_voucher=False):
+		'''Called from erpnext.stock.utils.update_bin'''
 		self.update_qty(args)
 
 		if args.get("actual_qty") or args.get("voucher_type") == "Stock Reconciliation":
@@ -55,15 +56,6 @@
 		if args.get("voucher_type")=="Stock Reconciliation":
 			if args.get('is_cancelled') == 'No':
 				self.actual_qty = args.get("qty_after_transaction")
-			else:
-				qty_after_transaction = frappe.db.get_value("""select qty_after_transaction
-					from `tabStock Ledger Entry`
-					where item_code=%s and warehouse=%s
-					and not (voucher_type='Stock Reconciliation' and voucher_no=%s)
-					order by posting_date desc limit 1""",
-					(self.item_code, self.warehouse, args.get('voucher_no')))
-
-				self.actual_qty = flt(qty_after_transaction[0][0]) if qty_after_transaction else 0.0
 		else:
 			self.actual_qty = flt(self.actual_qty) + flt(args.get("actual_qty"))
 
@@ -72,7 +64,8 @@
 		self.indented_qty = flt(self.indented_qty) + flt(args.get("indented_qty"))
 		self.planned_qty = flt(self.planned_qty) + flt(args.get("planned_qty"))
 
-		self.save()
+		self.set_projected_qty()
+		self.db_update()
 
 	def set_projected_qty(self):
 		self.projected_qty = (flt(self.actual_qty) + flt(self.ordered_qty)
@@ -111,3 +104,6 @@
 	frappe.db.sql('''update tabItem set
 		total_projected_qty = ifnull((select sum(projected_qty) from tabBin where item_code=%s), 0)
 		where name=%s''', (item_code, item_code))
+
+def on_doctype_update():
+	frappe.db.add_index("Bin", ["item_code", "warehouse"])
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 4d96c42..58bcff0 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -1,1241 +1,1282 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2013-03-29 18:22:12",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-03-29 18:22:12", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcode",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Barcode",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_2",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "s_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Source Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "s_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "s_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Source Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "s_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "t_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Target Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "t_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "t_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Target Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "t_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sec_break1",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sec_break1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 3,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Item Code",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_8",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": "300px",
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "300px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image View",
-   "length": 0,
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "quantity_and_rate",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Quantity and Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quantity and Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 3,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Qty",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "basic_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Basic Rate (as per Stock UOM)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "incoming_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "basic_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Basic Rate (as per Stock UOM)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "incoming_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "basic_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Basic Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "basic_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Basic Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "additional_cost",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Additional Cost",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "additional_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Additional Cost", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amount",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Valuation Rate",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "conversion_factor",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Conversion Factor",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "conversion_factor",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "conversion_factor", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "transfer_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Qty as per Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "transfer_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transfer_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "transfer_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no_batch",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial No / Batch",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no_batch", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No / Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "serial_no",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "batch_no",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Batch No",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "batch_no",
-   "oldfieldtype": "Link",
-   "options": "Batch",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Batch No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "batch_no", 
+   "oldfieldtype": "Link", 
+   "options": "Batch", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "accounting",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Accounting",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounting", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounting", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Difference Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:cint(frappe.sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Difference Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break5",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": ":Company",
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": ":Company", 
+   "depends_on": "eval:cint(frappe.sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "More Information",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "More Information", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "allow_zero_valuation_rate",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow Zero Valuation Rate",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_zero_valuation_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Zero Valuation Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "actual_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Actual Qty (at source/target)",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "actual_qty",
-   "oldfieldtype": "Read Only",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actual_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actual Qty (at source/target)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "actual_qty", 
+   "oldfieldtype": "Read Only", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "BOM No. for a Finished Good Item",
-   "fieldname": "bom_no",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "BOM No",
-   "length": 0,
-   "no_copy": 0,
-   "options": "BOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "BOM No. for a Finished Good Item", 
+   "fieldname": "bom_no", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "BOM No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break6",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Material Request used to make this Stock Entry",
-   "fieldname": "material_request",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Material Request",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Material Request",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Material Request used to make this Stock Entry", 
+   "fieldname": "material_request", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Material Request", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Material Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "material_request_item",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Material Request Item",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Material Request Item",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "material_request_item", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Material Request Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Material Request Item", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2017-04-21 02:56:48.306627",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Stock Entry Detail",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "ASC",
- "track_changes": 0,
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-06-08 10:38:10.914780", 
+ "modified_by": "prateeksha@erpnext.com", 
+ "module": "Stock", 
+ "name": "Stock Entry Detail", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index f5aced3..8275c84 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -694,7 +694,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:45:07.733480", 
+ "modified": "2017-06-09 14:45:07.888888", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ledger Entry", 
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 55a307c..b5d2e3f 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -129,3 +129,5 @@
 		frappe.db.commit()
 		frappe.db.sql("""alter table `tabStock Ledger Entry`
 			add index posting_sort_index(posting_date, posting_time, name)""")
+
+	frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
diff --git a/erpnext/templates/includes/projects/project_timesheets.html b/erpnext/templates/includes/projects/project_timesheets.html
index 3a9aecd..66f4771 100644
--- a/erpnext/templates/includes/projects/project_timesheets.html
+++ b/erpnext/templates/includes/projects/project_timesheets.html
@@ -5,7 +5,7 @@
 			<div class='col-xs-9'>
 				<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}"  > {{ timesheet.info.name }} </span> 
 				<div class="small text-muted item-timestamp">
-				{{ __("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ __("to") }} {{ frappe.format_date(timesheet.to_time) }}
+				{{ _("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ _("to") }} {{ frappe.format_date(timesheet.to_time) }}
 			</div>
 			</div>
 				<div class='col-xs-1 gravatar-top'>
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 5e15f68..a28948b 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -5,7 +5,7 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,إلغاء مادة زيارة موقع {0} قبل إلغاء هذه المطالبة الضمان
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,المنتجات الاستهلاكية
 DocType: Item,Customer Items,منتجات العميل
-DocType: Project,Costing and Billing,حساب التكلفة والفواتير
+DocType: Project,Costing and Billing,التكلفة و الفواتير
 apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,الحساب {0}: حسابه الرئيسي {1} لا يمكنه أن يكون دفتر حسابات (دفتر أستاذ)
 DocType: Item,Publish Item to hub.erpnext.com,نشر البند إلى hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,إشعارات البريد الإلكتروني
@@ -127,7 +127,7 @@
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 DocType: Process Payroll,Make Bank Entry,أنشئ قيد محاسبي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق التقاعد
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,الاستهلاك المقبل التاريخ لا يمكن أن يكون قبل تاريخ الشراء
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,التاريخ التالي للأهلاك لا يمكن ان يكون قبل تاريخ الشراء
 DocType: SMS Center,All Sales Person,كل مندوبى البيع
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** التوزيع الشهري ** يساعدك على توزيع  الهدف أو الميزانية على مدى عدة شهور إذا كان لديك موسمية في عملك.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,لا وجدت وحدات
@@ -161,18 +161,18 @@
 DocType: Journal Entry,Opening Entry,فتح دخول
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب لدفع فقط
 DocType: Employee Loan,Repay Over Number of Periods,سداد أكثر من عدد فترات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1} غير مسجل في {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1}لم يسجل التحديد {2}
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,لا يمكن تحويل حساب جرت عليه أي عملية إلى مجموعة.
 DocType: Lead,Product Enquiry,الإستفسار عن المنتج
 DocType: Academic Term,Schools,مرفق تعليمي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},لا يوجد سجل إجازة تم العثور عليه للموظف {0} في {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,يرجى إدخال الشركة الأولى
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,فضلا ادخل الشركة اولا
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,يرجى تحديد الشركة أولا
 DocType: Employee Education,Under Graduate,دبلومة
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
-DocType: Journal Entry Account,Employee Loan,سلفة موظف
+DocType: Journal Entry Account,Employee Loan,قرض الموظف
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,:سجل النشاط
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,العقارات
@@ -202,7 +202,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,حدد مستودع الهدف
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,الرجاء إدخال البريد الإلكتروني لجهة الاتصال المفضلة
 DocType: Journal Entry,Contra Entry,الدخول كونترا
-DocType: Journal Entry Account,Credit in Company Currency,الائتمان في الشركة العملات
+DocType: Journal Entry Account,Credit in Company Currency,المدين في عملة الشركة
 DocType: Delivery Note,Installation Status,حالة تثبيت
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",هل تريد تحديث الحضور؟ <br> الحاضر: {0} \ <br> غائبة: {1}
@@ -243,7 +243,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,القوائم المالية
 DocType: Guardian,Students,الطلاب
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,قواعد لتطبيق التسعير والخصم .
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب أن تكون قائمة الأسعار المعمول بها لشراء أو بيع
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب ان تكون قائمة الأسعار منطبقه للشراء او البيع
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},تاريخ التثبيت لا يمكن أن يكون قبل تاريخ التسليم القطعة ل {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),معدل الخصم على قائمة الأسعار (٪)
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
@@ -265,7 +265,7 @@
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
-DocType: Company,Default Payroll Payable Account,افتراضي المرتبات حساب المدفوعات
+DocType: Company,Default Payroll Payable Account,حساب مدفوعات المرتب المعتاد
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,تحديث البريد الإلكتروني من مجموعة
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
@@ -327,7 +327,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"الصنف {0} غير موجودة في ""مواد الخام المتوفره"" الجدول في أمر الشراء {1}"
 DocType: Employee,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 DocType: Student Guardian,Mother,أم
@@ -364,7 +364,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المنتهية لا يمكن أن تكون أكبر من ""كمية لتصنيع"""
-DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس
+DocType: Period Closing Voucher,Closing Account Head,اقفال حساب المركز الرئيسي
 DocType: Employee,External Work History,تاريخ العمل الخارجي
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,خطأ مرجع دائري
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,اسم Guardian1
@@ -387,7 +387,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,المبلغ بعد الاستهلاك
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,الأحداث القادمة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,الرجاء اختيار الشهر والسنة
-DocType: Employee,Company Email,شركة البريد الإلكتروني
+DocType: Employee,Company Email,البريد الألكتروني للشركة
 DocType: GL Entry,Debit Amount in Account Currency,مقدار الخصم في حساب العملات
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ثمن الطلب
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,المعاملات المصرفية / النقدية ضد طرف أو لنقل الداخلي
@@ -402,7 +402,7 @@
 DocType: Item Tax,Tax Rate,ضريبة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} مخصصة أصلا للموظف {1} للفترة من {2} إلى {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,اختر البند
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,فاتورة الشراء {0} تم ترحيلها من قبل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,رقم المجموعة للصنف
@@ -424,8 +424,8 @@
 DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
 DocType: Depreciation Schedule,Schedule Date,جدول التسجيل
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",المكاسب و الخصومات و مكونات المرتب الاخرى
-DocType: Packed Item,Packed Item,ملاحظة التوصيل التغليف
-apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,الإعدادات الافتراضية لشراء صفقة.
+DocType: Packed Item,Packed Item,عنصر معبأ
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,الأعدادات المعتاده بحركة المشتريات.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},وجود النشاط التكلفة للموظف {0} ضد نوع النشاط - {1}
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,حقل إلزامي - الحصول على الطلاب من
 DocType: Program Enrollment,Enrolled courses,الدورات المسجلة
@@ -444,7 +444,7 @@
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (الموافق علي الإجازة)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) يجب ان تكون صلاحياتك 'مصادق علي الأجازه '
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 DocType: Student Log,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,السبب لفقدان
@@ -458,18 +458,18 @@
 DocType: Account,Cost of Goods Sold,تكلفة السلع المباعة
 DocType: Purchase Invoice,Yearly,سنويا
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,الرجاء إدخال مركز التكلفة
-DocType: Journal Entry Account,Sales Order,اوامر البيع
+DocType: Journal Entry Account,Sales Order,طلبات العملاء
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,متوسط نسبه المبيعات
 DocType: Assessment Plan,Examiner Name,اسم الفاحص
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
 DocType: Delivery Note,% Installed,٪ تم تثبيت
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,الفصول الدراسية / مختبرات الخ حيث يمكن جدولة المحاضرات.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,الرجاء إدخال اسم الشركة الأولى
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,فضلا ادخل اسم الشركة  اولا
 DocType: Purchase Invoice,Supplier Name,اسم المورد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,قراءة دليل ERPNext
 DocType: Account,Is Group,غير المجموعة
-DocType: Email Digest,Pending Purchase Orders,في انتظار أوامر الشراء
+DocType: Email Digest,Pending Purchase Orders,اوامر الشراء المعلقة
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,حدد الرقم التسلسلي بناءً على FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,الاختيار فاتورة المورد عدد تفرد
 DocType: Vehicle Service,Oil Change,تغيير زيت
@@ -522,7 +522,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
 ,Enough Parts to Build,يكفي لبناء أجزاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,الدخل المباشر
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",لا يمكن تصفية استنادا إلى الحساب ، إذا جمعت بواسطة حساب
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",لا يمكن اعتماد الفلتره علي الحساب في حالة انه مجمع الحساب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,موظف إداري
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,الرجاء تحديد الدورة التدريبية
 DocType: Timesheet Detail,Hrs,ساعات
@@ -579,7 +579,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
-apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,المالية / المحاسبة العام.
+apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,السنة المالية / المحاسبة.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,القيم المتراكمة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",عذراَ ، ارقام المسلسل لا يمكن دمجها
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,أنشئ طلب بيع
@@ -630,7 +630,7 @@
 DocType: Assessment Plan,Maximum Assessment Score,نتيجة تقييم القصوى
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,تواريخ عملية البنك التحديث
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,تتبع الوقت
-DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية
+DocType: Fiscal Year Company,Fiscal Year Company,السنة الحالية للشركة
 DocType: Packing Slip Item,DN Detail,DN التفاصيل
 DocType: Training Event,Conference,مؤتمر
 DocType: Timesheet,Billed,توصف
@@ -650,13 +650,13 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ليس في السنة المالية {2}
 DocType: Buying Settings,Settings for Buying Module,إعدادات لشراء وحدة
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},الأصول {0} لا تنتمي إلى شركة {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,من فضلك ادخل شراء استلام أولا
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,فضلا ادخل استلام المشتريات اولا
 DocType: Buying Settings,Supplier Naming By,المورد تسمية بواسطة
 DocType: Activity Type,Default Costing Rate,سعر التكلفة الافتراضي
 DocType: Maintenance Schedule,Maintenance Schedule,صيانة جدول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيت قاعدة التسعير على أساس العملاء، مجموعة العملاء، الأرض، المورد، نوع المورد ، الحملة، شريك المبيعات الخ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,صافي التغير في المخزون
-apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,إدارة القروض موظف
+apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,لجنة ادارة قرض الموظف
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,العلاقة مع Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
@@ -679,7 +679,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,تحويل إلى المجموعة
 DocType: Activity Cost,Activity Type,نوع النشاط
 DocType: Request for Quotation,For individual supplier,عن مورد فردي
-DocType: BOM Operation,Base Hour Rate(Company Currency),أسعار ساعة قاعدة (شركة العملات)
+DocType: BOM Operation,Base Hour Rate(Company Currency),سعر الساعه الأساسي ( عملة الشركة )
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,المقدار المسلم
 DocType: Supplier,Fixed Days,يوم الثابتة
 DocType: Quotation Item,Item Balance,البند الميزان
@@ -734,7 +734,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,قيمة المخزون
-apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,لا توجد شركة {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,الشركة ليست موجوده {0}
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,نوع الشجرة
 DocType: BOM Explosion Item,Qty Consumed Per Unit,الكمية المستهلكة لكل وحدة
 DocType: Serial No,Warranty Expiry Date,ضمان تاريخ الانتهاء
@@ -745,7 +745,7 @@
 DocType: Purchase Order,Link to material requests,رابط لطلبات المادية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,الفضاء
 DocType: Journal Entry,Credit Card Entry,إدخال بطاقة إئتمان
-apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,شركة والحسابات
+apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,الشركة و دليل الحسابات
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,تلقى السلع من الموردين.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,في القيمة
 DocType: Lead,Campaign Name,اسم الحملة
@@ -762,7 +762,7 @@
 DocType: Production Order Operation,Planned End Time,وقت الانتهاء المخطط له
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,لا يمكن تحويل حساب جرت عليه أي عملية إلى حساب أستاذ (دفتر أستاذ)
-DocType: Delivery Note,Customer's Purchase Order No,رقم طلب شراء العميل
+DocType: Delivery Note,Customer's Purchase Order No,رقم امر الشراء العميل
 DocType: Budget,Budget Against,الميزانية ضد
 DocType: Employee,Cell Number,رقم الهاتف
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,إنشاء طلب مواد تلقائي
@@ -774,7 +774,7 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بيان الراتب الشهري.
 DocType: BOM,Website Specifications,موقع المواصفات
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} من {0} من نوع {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: من {0} النوع {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
 DocType: Employee,A+,أ+
@@ -827,11 +827,11 @@
 DocType: Employee,Bank A/C No.,رقم الحساب المصرفي.
 DocType: Bank Guarantee,Project,مشروع
 DocType: Quality Inspection Reading,Reading 7,قراءة 7
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,أمرت جزئيا
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,طلبت جزئيا
 DocType: Expense Claim Detail,Expense Claim Type,نوع  المطالبة  بالنفقات
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,الإعدادات الافتراضية لسلة التسوق
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},الأصول ألغت عبر إدخال دفتر اليومية {0}
-DocType: Employee Loan,Interest Income Account,الحساب الخاص بإيرادات الفائدة
+DocType: Employee Loan,Interest Income Account,حساب الدخل من الفائدة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,التكنولوجيا الحيوية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,مصاريف صيانة المكاتب
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,إعداد حساب بريد إلكتروني
@@ -932,7 +932,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","رصيد حساب بالفعل في الائتمان، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'كما' الخصم '"
 DocType: Account,Balance must be,يجب أن يكون التوازن
 DocType: Hub Settings,Publish Pricing,نشر التسعير
-DocType: Notification Control,Expense Claim Rejected Message,المطالبة حساب رفض رسالة
+DocType: Notification Control,Expense Claim Rejected Message,رسالة رفض  طلب النفقات
 ,Available Qty,الكمية المتاحة
 DocType: Purchase Taxes and Charges,On Previous Row Total,على إجمالي الصف السابق
 DocType: Purchase Invoice Item,Rejected Qty,الكمية المرفوضة
@@ -956,7 +956,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,لا يمكن تلقائيا إنشاء حساب كما أن هناك بالفعل توازن الأسهم في الحساب. يجب عليك إنشاء حساب مطابقة قبل أن تتمكن من إجراء الدخول على هذا المستودع
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,لا يمكن إنشاء الحساب تلقائي في حال وجود رصيد مخزني في الحساب . يجب عليك إنشأ حساب مطابقة قبل عمل الأدخال في المخزون
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,فاتورة الموارد {0} يجب أن تكون نشطة
 DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
@@ -979,17 +979,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,لا يمكن {0} {1} {2} من دون أي فاتورة المعلقة السلبية
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,عربون  فاتورة الشراء
 DocType: Hub Settings,Sync Now,مزامنة الآن
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
 apps/erpnext/erpnext/config/accounts.py +215,Define budget for a financial year.,تحديد ميزانية او مخصصات السنة المالية
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,سيتم الافتراضي بنك / الصرف حساب الفاتورة تلقائيا تحديث في POS عند تحديد هذا الوضع.
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,حساب الخزنه / البنك المعتاد سوف يعدل تلقائي في فاتورة نقاط البيع عند اختيار الوضع
 DocType: Lead,LEAD-,قيادة-
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,العلامة التجارية
-DocType: Employee,Exit Interview Details,تفاصيل مقابلة مغادرة الشركة
-DocType: Item,Is Purchase Item,هو شراء مادة
+DocType: Employee,Exit Interview Details,تفاصيل مقابلة ترك الخدمه
+DocType: Item,Is Purchase Item,شراء صنف
 DocType: Asset,Purchase Invoice,فاتورة شراء
 DocType: Stock Ledger Entry,Voucher Detail No,تفاصيل قسيمة لا
 apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,فاتورة مبيعات جديدة
@@ -1010,7 +1010,7 @@
 DocType: Job Opening,Publish on website,نشر على الموقع الإلكتروني
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,الشحنات للعملاء.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,المورد تاريخ الفاتورة لا يمكن أن يكون أكبر من تاريخ النشر
-DocType: Purchase Invoice Item,Purchase Order Item,شراء السلعة ترتيب
+DocType: Purchase Invoice Item,Purchase Order Item,صنف امر الشراء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,الدخل غير المباشرة
 DocType: Student Attendance Tool,Student Attendance Tool,أداة طالب الحضور
 DocType: Cheque Print Template,Date Settings,إعدادات التاريخ
@@ -1027,7 +1027,7 @@
 						Please enter a valid Invoice",صف {0}: فاتورة {1} غير صالح، قد يتم إلغاء / لا وجود لها. \ الرجاء إدخال الفاتورة صحيحة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,مادة كيميائية
-DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,البنك الافتراضي / سيتم تحديث الحساب النقدي تلقائيا في الراتب دفتر اليومية عندما يتم تحديد هذا الوضع.
+DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,حساب الخزنه / البنك المعتاد سوف يعدل تلقائي في القيود اليوميه للمرتب عند اختيار الوضع.
 DocType: BOM,Raw Material Cost(Company Currency),الخام المواد التكلفة (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},الصف # {0}: لا يمكن أن يكون المعدل أكبر من المعدل المستخدم في {1} {2}
@@ -1038,7 +1038,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,نقلها
 DocType: BOM Website Item,BOM Website Item,BOM موقع البند
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
-DocType: Timesheet Detail,Bill,فاتورة حساب
+DocType: Timesheet Detail,Bill,فاتورة
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,يتم إدخال الاستهلاك المقبل التاريخ كتاريخ الماضي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع العملاء المحتملين (فتح)
@@ -1059,16 +1059,16 @@
 DocType: Repayment Schedule,Balance Loan Amount,التوازن مبلغ القرض
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,دورة الجدول الزمني
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,خيارات المخزون
-DocType: Journal Entry Account,Expense Claim,حساب المطالبات
+DocType: Journal Entry Account,Expense Claim,طلب النفقات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,هل تريد حقا أن استعادة هذه الأصول ألغت؟
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},الكمية ل{0}
 DocType: Leave Application,Leave Application,طلب اجازة
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,أداة تخصيص الإجازة
 DocType: Leave Block List,Leave Block List Dates,التواريخ الممنوع اخذ اجازة فيها
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هبطت استلام تكلفة الشراء
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,تكاليف المشتريات المستلمة
 DocType: Company,Default Terms,الشروط الافتراضية
-DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زلة
+DocType: Packing Slip Item,Packing Slip Item,مادة كشف التعبئة
 DocType: Purchase Invoice,Cash/Bank Account,حساب النقد / البنك
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},الرجاء تحديد {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
@@ -1104,7 +1104,7 @@
 DocType: Lead,Organization Name,اسم المنظمة
 DocType: Tax Rule,Shipping State,الدولة الشحن
 ,Projected Quantity as Source,المتوقع الكمية كمصدر
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"الصنف يجب اضافته مستخدما  مفتاح ""احصل علي الأصناف من المشتريات المستلمة """
 DocType: Employee,A-,أ-
 DocType: Production Planning Tool,Include non-stock items,وتشمل البنود غير المالية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,مصاريف المبيعات
@@ -1150,7 +1150,7 @@
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,تفاصيل الفاتورة نموذج - س
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,دفع فاتورة المصالحة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,المساهمة٪
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,أرقام تسجيل الشركة للرجوع اليها. أرقام الضرائب الخ.
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,تسجيل ارقام الشركة لمرجع . ارقام البطاقه الضريبه الخ
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
@@ -1203,7 +1203,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
 ,Purchase Order Items To Be Billed,أمر الشراء البنود لتكون وصفت
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
-DocType: Purchase Invoice Item,Purchase Invoice Item,شراء السلعة الفاتورة
+DocType: Purchase Invoice Item,Purchase Invoice Item,اصناف فاتورة المشتريات
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ويرسل الأوراق المالية ليدجر مقالات وGL مقالات لشراء شهادات مختارة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,البند 1
 DocType: Holiday,Holiday,عطلة
@@ -1313,7 +1313,7 @@
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
 DocType: Student Group Student,Group Roll Number,رقم لفة المجموعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",لـ {0} فقط إنشاء حسابات ممكن توصيله مقابل ادخال دائن اخر
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
@@ -1365,7 +1365,7 @@
 DocType: Payment Entry,Writeoff,لا تصلح
 DocType: Appraisal Template Goal,Appraisal Template Goal,معيار نموذج التقييم
 DocType: Salary Component,Earning,الكسب
-DocType: Purchase Invoice,Party Account Currency,حزب حساب العملات
+DocType: Purchase Invoice,Party Account Currency,عملة حساب الطرف
 ,BOM Browser,BOM متصفح
 DocType: Purchase Taxes and Charges,Add or Deduct,إضافة أو خصم
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +80,Overlapping conditions found between:,الظروف المتداخلة وجدت بين:
@@ -1377,7 +1377,7 @@
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,علامة إن حضور
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},جدول الصيانة {0} موجود ضد {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,طالب انتساب
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},يجب أن تكون عملة الحساب الختامي {0}
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},عملة حساب الأقفال يجب ان تكون {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع النقاط لجميع الأهداف يجب أن يكون 100. ومن {0}
 DocType: Project,Start and End Dates,تواريخ البدء والانتهاء
 ,Delivered Items To Be Billed,وحدات تسليمها الى أن توصف
@@ -1429,7 +1429,7 @@
 DocType: Employee,Owned,مالك
 DocType: Salary Detail,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
 DocType: Pricing Rule,"Higher the number, higher the priority",الرقم الأعلى له أولوية أكبر
-,Purchase Invoice Trends,شراء اتجاهات الفاتورة
+,Purchase Invoice Trends,اتجهات فاتورة الشراء
 DocType: Employee,Better Prospects,آفاق أفضل
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",الصف # {0}: الدفعة {1} فقط {2} الكمية. يرجى تحديد دفعة أخرى توفر {3} الكمية أو تقسيم الصف إلى صفوف متعددة، لتسليم / إصدار من دفعات متعددة
 DocType: Vehicle,License Plate,لوحة معدنية
@@ -1484,10 +1484,10 @@
 DocType: Quality Inspection,QI-,QI-
 DocType: Opportunity,With Items,مع الأصناف
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,في الكمية
-DocType: Notification Control,Expense Claim Rejected,المطالبة حساب مرفوض
+DocType: Notification Control,Expense Claim Rejected,تم رفض طلب النفقات
 DocType: Item,Item Attribute,البند السمة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,حكومة
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,حساب النفقات {0} موجود بالفعل لسجل المركبة
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,طلب النفقات {0} موجود بالفعل لسجل المركبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,اسم المعهد
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,الرجاء إدخال سداد المبلغ
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,المتغيرات البند
@@ -1506,11 +1506,11 @@
 DocType: POS Profile,Apply Discount,تطبيق الخصم
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,مشاريع مفتوحة
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,تم إلغاء كشف/كشوف التعبئة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,تدفق النقد من الاستثمار
 DocType: Program Course,Program Course,دورة برنامج
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,الشحن و التخليص الرسوم
-DocType: Homepage,Company Tagline for website homepage,سطر الوصف شركة لموقعه الإلكتروني
+DocType: Homepage,Company Tagline for website homepage,توجية الشركة للصفحة الرئيسيه بالموقع الألكتروني
 DocType: Item Group,Item Group Name,البند اسم المجموعة
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ
 DocType: Student,Date of Leaving,تاريخ مغادرة
@@ -1556,7 +1556,7 @@
 DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},رقم لفة مكرر للطالب {0}
 DocType: Budget,Action if Annual Budget Exceeded,العمل إذا تجاوز الميزانية السنوية
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,طلب المادي لأمر الشراء
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,الخامات المطلوبه لأمر الشراء
 DocType: Shopping Cart Settings,Payment Success URL,رابط نجاح الدفع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 DocType: Purchase Receipt,PREC-,PREC-
@@ -1567,7 +1567,7 @@
 DocType: C-Form,III,الثالث
 apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,فتح البورصة الميزان
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} يجب أن تظهر مرة واحدة فقط
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},لا يسمح للإنتقال أكثر {0} من {1} ضد طلب شراء {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},غير مسموح بتحويل اكثر {0} من {1} مقابل امر الشراء {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},اجازات مخصصة بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
@@ -1576,7 +1576,7 @@
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",إذا تحققت، الصفحة الرئيسية ستكون المجموعة الافتراضية البند للموقع
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM الافتراضي ل{0} لم يتم العثور على مشروع {1}
-apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,مطالبات لحساب الشركة.
+apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,مستحقات لمصروفات الشركة
 apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",الطلاب في قلب النظام، إضافة كل ما تبذلونه من الطلاب
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},الصف # {0}: تاريخ التخليص {1} لا يمكن أن يكون قبل تاريخ شيكات {2}
 DocType: Company,Default Holiday List,قائمة العطل الافتراضية
@@ -1635,7 +1635,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,جعل صرف الدخول
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,الصف {0}: تقدم ضد مورد يجب بخصم
 DocType: Company,Default Values,قيم افتراضية
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{فريكونسي} ديجيست
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{التردد} الخلاصه
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,وذلك بناء على سجلات ضد هذه السيارات. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع
@@ -1681,7 +1681,7 @@
 DocType: Student Sibling,Studying in Same Institute,الذين يدرسون في نفس المعهد
 DocType: Territory,Territory Manager,مدير إقليمي
 DocType: Packed Item,To Warehouse (Optional),إلى مستودع (اختياري)
-DocType: Payment Entry,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
+DocType: Payment Entry,Paid Amount (Company Currency),المبلغ المدفوع ( بعملة الشركة )
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,إعدادات البيع
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزادات على الانترنت
@@ -1697,7 +1697,7 @@
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,واحد وحدة من عنصر.
 DocType: Fee Category,Fee Category,رسوم الفئة
 ,Student Fee Collection,طالب رسوم مجموعة
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,اكتب قيد يوميه لكل حركة مخزنية ؟
 DocType: Leave Allocation,Total Leaves Allocated,إجمالي الاجازات المخصصة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,الرجاء إدخال ساري المفعول بداية السنة المالية وتواريخ نهاية
@@ -1723,7 +1723,7 @@
 DocType: Quotation,Order Type,نوع الطلب
 DocType: Purchase Invoice,Notification Email Address,عنوان البريد الإلكتروني الإخطار
 ,Item-wise Sales Register,مبيعات البند الحكيم سجل
-DocType: Asset,Gross Purchase Amount,الإجمالي المبلغ شراء
+DocType: Asset,Gross Purchase Amount,اجمالي مبلغ المشتريات
 DocType: Asset,Depreciation Method,طريقة الاستهلاك
 apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,غير متصل
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,هل هذه الضريبة متضمنة في الاسعار الأساسية؟
@@ -1747,7 +1747,7 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Email Digest,Annual Expenses,المصروفات السنوية
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,انشئ طلب شراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,قم بعمل امر الشراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من توازن إجازة لإجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1772,11 +1772,11 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,الرجاء إنشاء حساب لهذا مستودع وربطه. لا يمكن القيام بذلك تلقائيا حساب مع اسم {0} موجود بالفعل
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: Student Group,Instructors,المدربين
-DocType: GL Entry,Credit Amount in Account Currency,مبلغ الدائن بعملة الحساب
+DocType: GL Entry,Credit Amount in Account Currency,إنشاء المبلغ في حساب العملة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,دفعة
 apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,إدارة طلباتك
 DocType: Production Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},طلب المواد من الحد الأقصى {0} يمكن إجراء القطعة ل {1} ضد ترتيب المبيعات {2}
@@ -1848,7 +1848,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ترك نوع {0} لا يمكن تخصيصها لأنها إجازة بدون راتب
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
-DocType: Item,Is Sales Item,هو المبيعات الإغلاق
+DocType: Item,Is Sales Item,صنف المبيعات
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,شجرة مجموعة البند
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
 DocType: Maintenance Visit,Maintenance Time,وقت الصيانة
@@ -1882,7 +1882,7 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,شجرة مجموعات البنود .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
 DocType: Asset,Sold,تم البيع
-,Item-wise Purchase History,البند الحكيم تاريخ الشراء
+,Item-wise Purchase History,الحركة التاريخيه للمشتريات وفقا للصنف
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر الانتاج المفتوحة
@@ -1936,7 +1936,7 @@
 DocType: Item,Has Batch No,ودفعة واحدة لا
 apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},الفواتير السنوية:  {0}
 DocType: Delivery Note,Excise Page Number,المكوس رقم الصفحة
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",شركة، من تاريخ وإلى تاريخ إلزامي
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","اجباري الشركة , من تاريخ و الي تاريخ"
 DocType: Asset,Purchase Date,تاريخ الشراء
 DocType: Employee,Personal Details,تفاصيل شخصية
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},الرجاء تعيين &quot;الأصول مركز الاستهلاك الكلفة&quot; في شركة {0}
@@ -1970,7 +1970,7 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,الجداول الزمنية
 DocType: HR Settings,HR Settings,إعدادات الموارد البشرية
 DocType: Salary Slip,net pay info,معلومات صافي الأجر
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,"اعتماد طلب النفقات معلق , فقط اعتماده ممكن تغير الحالة."
 DocType: Email Digest,New Expenses,مصاريف جديدة
 DocType: Purchase Invoice,Additional Discount Amount,مقدار الخصم الاضافي
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن يكون العدد 1، والبند هو أصل ثابت. الرجاء استخدام صف منفصل عن الكمية متعددة.
@@ -1990,7 +1990,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Profile,Price List,قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} هي السنة المالية الافتراضية الآن،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,مطالبات حساب
+apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,طلب النفقات
 DocType: Issue,Support,الدعم
 ,BOM Search,BOM البحث
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
@@ -2044,21 +2044,21 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},رقم المسلسل {0} هو تحت الضمان لغاية {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
 apps/erpnext/erpnext/hooks.py +87,Shipments,شحنات
-apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,يجب أن يكون رصيد الحساب ({0}) ل {1} وقيمة المخزون ({2}) للمستودع {3} هو نفسه
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,رصيد حساب GL ({0}) ل {1} وقيمة المخزون ({2}) للمستودع {3} يجب ان يكونوا متساويين
 DocType: Payment Entry,Total Allocated Amount (Company Currency),إجمالي المبلغ المخصص (شركة العملات)
 DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
 DocType: BOM,Scrap Material Cost,التكلفة الخردة المواد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,رقم المسلسل {0} لا تنتمي إلى أي مستودع
-DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة)
+DocType: Purchase Invoice,In Words (Company Currency),في الأحرف ( عملة الشركة )
 DocType: Asset,Supplier,المورد
 DocType: C-Form,Quarter,ربع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,المصروفات المتنوعة
 DocType: Global Defaults,Default Company,الشركة الافتراضية
-apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة المخزون الإجمالية
+apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اجباري حساب النفقات او الفروق للصنف {0} تأثير شامل لقيمة المخزون
 DocType: Payment Request,PR,العلاقات العامة
 DocType: Cheque Print Template,Bank Name,اسم البنك
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-أعلى
-DocType: Employee Loan,Employee Loan Account,حساب القرض موظف
+DocType: Employee Loan,Employee Loan Account,حساب GL قرض الموظف
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
 DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,عدد التفاعل
@@ -2098,7 +2098,7 @@
 apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,جرد المتسلسلة
 DocType: Employee Loan,Account Info,معلومات الحساب
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0} تم إنشاء مجموعات الطلاب.
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0} تم إنشاء مجموعات الطالب.
 DocType: Sales Invoice,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,يجب أن يكون هناك حساب البريد الإلكتروني الافتراضي واردة لهذا العمل. يرجى إعداد حساب بريد إلكتروني واردة الافتراضي (POP / IMAP) وحاول مرة أخرى.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,حساب المستحق
@@ -2125,7 +2125,7 @@
 DocType: Employee,Contact Details,كيفية التواصل
 DocType: C-Form,Received Date,تاريخ الاستلام
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",إذا قمت بإنشاء قالب قياسي في قالب الضرائب على المبيعات والرسوم، اختر واحدا وانقر على الزر أدناه.
-DocType: BOM Scrap Item,Basic Amount (Company Currency),المبلغ الأساسي (شركة العملات)
+DocType: BOM Scrap Item,Basic Amount (Company Currency),المبلغ الأساسي ( عملة الشركة )
 DocType: Student,Guardians,أولياء الأمور
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,لن تظهر الأسعار إذا لم يتم تعيين قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,يرجى تحديد بلد لهذا الشحن القاعدة أو تحقق من جميع أنحاء العالم الشحن
@@ -2148,10 +2148,10 @@
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,بحث منتوج
 DocType: Timesheet Detail,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الموافقة دور (أعلى قيمة أذن)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,حساب دائن الى يجب أن يكون من حسابات المدفوعات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,لإنشاء الحساب يجب ان يكون دائنون / مدفوعات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},فاتورة الموارد: {0} لا يمكن ان تكون والد او واد من {2}
 DocType: Production Order Operation,Completed Qty,الكمية المنتهية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",لـ {0} فقط إنشاء حسابات ممكن توصيله مقابل ادخال مدين اخر
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},صف {0}: اكتمال الكمية لا يمكن أن يكون أكثر من {1} لتشغيل {2}
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
@@ -2201,7 +2201,7 @@
 DocType: SMS Log,Sender Name,اسم المرسل
 DocType: POS Profile,[Select],[اختر ]
 DocType: SMS Log,Sent To,يرسل الى
-DocType: Payment Request,Make Sales Invoice,أنشئ فاتورة مبيعات
+DocType: Payment Request,Make Sales Invoice,انشاء فاتورة المبيعات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,برامج
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,التالي اتصل بنا التسجيل لا يمكن أن يكون في الماضي
 DocType: Company,For Reference Only.,للاشارة فقط.
@@ -2258,7 +2258,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Training Event,End Time,وقت الانتهاء
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,هيكل الراتب نشط {0} تم العثور عليها ل موظف {1} للتواريخ معينة
-DocType: Payment Entry,Payment Deductions or Loss,الخصومات الدفع أو الخسارة
+DocType: Payment Entry,Payment Deductions or Loss,خصومات الدفع أو الخسارة
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية للمبيعات أو للمشتريات .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,المجموعة بواسطة قسيمة
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط أنابيب المبيعات
@@ -2268,7 +2268,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},الرجاء تحديد BOM لعنصر في الصف {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +263,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
-DocType: Notification Control,Expense Claim Approved,المطالبة حساب المعتمدة
+DocType: Notification Control,Expense Claim Approved,اعتمد طلب النفقات
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,كشف راتب الموظف {0} تم إنشاؤه مسبقا لهذه الفترة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,الأدوية
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,تكلفة البنود التي تم شراؤها
@@ -2329,7 +2329,7 @@
 DocType: Supplier Quotation,Opportunity,فرصة
 ,Completed Production Orders,أوامر الإنتاج المنتهية
 DocType: Operation,Default Workstation,محطة العمل الافتراضية
-DocType: Notification Control,Expense Claim Approved Message,المطالبة حساب المعتمدة رسالة
+DocType: Notification Control,Expense Claim Approved Message,رسالة اعتماد طلب النفقات
 DocType: Payment Entry,Deductions or Loss,الخصومات أو الخسارة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} مغلقة
 DocType: Email Digest,How frequently?,كيف كثير من الأحيان؟
@@ -2341,7 +2341,7 @@
 DocType: Project,% Complete Method,الطريقة الكاملة٪
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},صيانة تاريخ بداية لا يمكن أن يكون قبل تاريخ التسليم لل رقم المسلسل {0}
 DocType: Production Order,Actual End Date,تاريخ الإنتهاء الفعلي
-DocType: BOM,Operating Cost (Company Currency),تكاليف التشغيل (شركة العملات)
+DocType: BOM,Operating Cost (Company Currency),تكاليف التشغيل ( بعملة الشركة )
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),تنطبق على (الدور)
 DocType: Stock Entry,Purpose,غرض
@@ -2412,7 +2412,7 @@
 DocType: Homepage,Homepage,الصفحة الرئيسية
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},السجلات رسوم المنشأة - {0}
-DocType: Asset Category Account,Asset Category Account,حساب الأصول الفئة
+DocType: Asset Category Account,Asset Category Account,حساب فئة الأصل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
@@ -2473,7 +2473,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,إعدادات سلة التسوق
 DocType: Journal Entry,Accounting Entries,القيود المحاسبة
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},تكرار الدخول . يرجى مراجعة تصريح القاعدة {0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},الملف POS العالمي {0} تم إنشاؤها مسبقا لشركة {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},الصورة الشامه لنقاط البيع {0}  تم انشأها من قبل للشركة {1}
 DocType: Purchase Order,Ref SQ,المرجع SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,استبدال السلعة / BOM في جميع BOMs
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,يجب تقديم وثيقة استلام
@@ -2553,7 +2553,7 @@
 DocType: Delivery Note,Required only for sample item.,المطلوب فقط لمادة العينة.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},لا قسيمة الراتب وجدت بين {0} و {1}
-,Pending SO Items For Purchase Request,العناصر المعلقة وذلك لطلب الشراء
+,Pending SO Items For Purchase Request,اصناف كتيرة معلقة  لطلب الشراء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,قبول الطلاب
 apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} معطل {1}
 DocType: Supplier,Billing Currency,الفواتير العملات
@@ -2629,7 +2629,7 @@
  1. معالجة والاتصال من الشركة الخاصة بك."
 DocType: Attendance,Leave Type,نوع الاجازة
 DocType: Purchase Invoice,Supplier Invoice Details,المورد تفاصيل الفاتورة
-apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"حساب / حساب الفرق ({0}) يجب أن يكون الربح أو الخسارة ""حساب"
+apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر
 DocType: Project,Copied From,تم نسخها من
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},اسم خطأ : {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,نقص
@@ -2637,7 +2637,7 @@
 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),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
 ,Salary Register,راتب التسجيل
-DocType: Warehouse,Parent Warehouse,مستودع الوالدين
+DocType: Warehouse,Parent Warehouse,المستودع الأصل
 DocType: C-Form Invoice Detail,Net Total,مجموع صافي
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,تحديد أنواع القروض المختلفة
 DocType: Bin,FCFS Rate,FCFS قيم
@@ -2668,7 +2668,7 @@
 DocType: Course,Course Code,رمز المقرر
 apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
-DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي معدل (شركة العملات)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي السعر ( بعملة الشركة )
 DocType: Salary Detail,Condition and Formula Help,مساعدة باستخدام الصيغ و الشروط
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,إدارة شجرة الإقليم.
 DocType: Journal Entry Account,Sales Invoice,فاتورة مبيعات
@@ -2718,7 +2718,7 @@
 DocType: Production Order Operation,Estimated Time and Cost,الوقت المقدر والتكلفة
 DocType: Bin,Bin,صندوق
 DocType: SMS Log,No of Sent SMS,رقم رسائل SMS  التي أرسلت
-DocType: Account,Expense Account,حساب المصروفات
+DocType: Account,Expense Account,حساب النفقات
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,البرمجيات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,اللون
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معايير خطة تقييم
@@ -2741,7 +2741,7 @@
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,الحفاظ على ساعات الفواتير وساعات العمل نفسه على الجدول الزمني
 DocType: Maintenance Visit Purpose,Against Document No,مقابل المستند رقم
 DocType: BOM,Scrap,خردة
-apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,إدارة المبيعات الشركاء.
+apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ادارة شركاء المبيعات.
 DocType: Quality Inspection,Inspection Type,نوع التفتيش
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
 DocType: Assessment Result Tool,Result HTML,نتيجة HTML
@@ -2760,12 +2760,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,نوع الجذر إلزامي
 DocType: BOM,Total Cost(Company Currency),التكلفة الإجمالية (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,المسلسل لا {0} خلق
-DocType: Homepage,Company Description for website homepage,وصف الشركة للصفحة الرئيسية
+DocType: Homepage,Company Description for website homepage,وصف الشركة للصفة الرئيسيه بالموقع الألكتروني
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,اسم Suplier
 DocType: Sales Invoice,Time Sheet List,الساعة قائمة ورقة
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
-DocType: Asset Category Account,Depreciation Expense Account,حساب الاستهلاك النفقات
+DocType: Asset Category Account,Depreciation Expense Account,حساب مصروفات الأهلاك
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,فترة الاختبار
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,موافق النفقات
@@ -2790,7 +2790,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ناشري الصحف
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,اختر السنة المالية
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
-DocType: Company,Chart Of Accounts Template,الرسم البياني من قالب الحسابات
+DocType: Company,Chart Of Accounts Template,قالب دليل الحسابات
 DocType: Attendance,Attendance Date,تاريخ الحضور
 apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},العنصر السعر تحديث ل{0} في قائمة الأسعار {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تقسيم الراتب بناءَ على الكسب والاستقطاع.
@@ -2848,7 +2848,7 @@
 DocType: Production Planning Tool,Include sub-contracted raw materials,وتشمل المواد الخام مع مقاولين من الباطن
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,قالب الشروط أو العقد.
 DocType: Purchase Invoice,Address and Contact,العناوين و التواصل
-DocType: Cheque Print Template,Is Account Payable,هو حساب المدفوعات
+DocType: Cheque Print Template,Is Account Payable,حساب المدينون / المدفوعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},لا يمكن تحديث المخزون ضد إيصال الشراء {0}
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Support Settings,Auto close Issue after 7 days,السيارات العدد قريبة بعد 7 أيام
@@ -2885,7 +2885,7 @@
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
-DocType: Employee Internal Work History,Employee Internal Work History,تاريخ عمل الموظف داخل الشركة
+DocType: Employee Internal Work History,Employee Internal Work History,الحركة التاريخيه لعمل الموظف الداخلي
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),إغلاق (الدكتور)
 DocType: Cheque Print Template,Cheque Size,مقاس الصك
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,رقم المسلسل {0} ليس في الأوراق المالية
@@ -2917,7 +2917,7 @@
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
 DocType: Lead,Lower Income,دخل أدنى
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","حساب الفروقات سجب ان يكون نوع حساب الأصول / الخصوم, بحيث مطابقة المخزون بأدخال الأفتتاحي"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ صرف لا يمكن أن يكون أكبر من مبلغ القرض {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,إنتاج النظام لم يخلق
@@ -2944,7 +2944,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,الخصم (٪) على سعر قائمة السعر مع الهامش
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,جميع المستودعات
 DocType: Sales Partner,Retailer,متاجر التجزئة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,حساب دائن الى يجب أن يكون من حسابات الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,لإنشاء حساب يجب ان يكون حساب الميزانية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,جميع أنواع  الموردين
 DocType: Global Defaults,Disable In Words,تعطيل في الكلمات
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
@@ -2980,7 +2980,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,لا يمكن جعل حساب له حسابات فرعيه دفتر الحسابات
 DocType: C-Form,II,الثاني
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لالعملاء
-DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ (شركة العملات)
+DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ  ( بعملة الشركة )
 DocType: Salary Slip,Hour Rate,سعرالساعة
 DocType: Stock Settings,Item Naming By,البند تسمية بواسطة
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},حركة إقفال أخرى {0} تم إنشائها بعد {1}
@@ -3028,13 +3028,13 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +321,Calls,المكالمات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
 DocType: Purchase Order Item Supplied,Stock UOM,وحدة قياس السهم
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,امر الشراء {0} لم يرحل
 DocType: Customs Tariff Number,Tariff Number,عدد التعرفة
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},رقم المسلسل {0} لا ينتمي إلى مستودع {1}
 apps/erpnext/erpnext/controllers/status_updater.py +163,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
 DocType: Notification Control,Quotation Message,رسالة التسعيرة
-DocType: Employee Loan,Employee Loan Application,موظف طلب القرض
+DocType: Employee Loan,Employee Loan Application,طلب قرض للموظف
 DocType: Issue,Opening Date,تاريخ الفتح
 apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
 DocType: Journal Entry,Remark,كلام
@@ -3057,7 +3057,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Student Admission,Admission End Date,تاريخ انتهاء القبول
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +29,Sub-contracting,التعاقد من الباطن
-DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
+DocType: Journal Entry Account,Journal Entry Account,حساب إدخال القيود اليومية
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,المجموعة الطلابية
 DocType: Shopping Cart Settings,Quotation Series,سلسلة تسعيرات
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
@@ -3086,9 +3086,9 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,الربح الإجمالي٪
 DocType: Appraisal Goal,Weightage (%),الوزن(٪)
 DocType: Bank Reconciliation Detail,Clearance Date,إزالة التاريخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,الإجمالي المبلغ شراء إلزامي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,اجباري اجمالي مبلغ المشتريات
 DocType: Lead,Address Desc,معالجة التفاصيل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,حزب إلزامي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,الطرف إلزامي
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,اسم الموضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,يجب اختيار واحدة على الاقل من المبيعات او المشتريات
@@ -3126,7 +3126,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,الربح الإجمالي / الخسارة
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,شراء السلعة ترتيب الموردة
-apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون الشركة
+apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,اسم الشركة لا يمكن تكون شركة
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,عنوان الرسالة لطباعة النماذج
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين نماذج الطباعة مثل الفاتورة الأولية.
 DocType: Student Guardian,Student Guardian,الجارديان طالب
@@ -3143,7 +3143,7 @@
 DocType: Purchase Invoice,Terms,الأحكام
 DocType: Academic Term,Term Name,اسم المدى
 DocType: Buying Settings,Purchase Order Required,أمر الشراء المطلوبة
-,Item-wise Sales History,تاريخ المبيعات بناء على البنود
+,Item-wise Sales History,الحركة التاريخيه وفقا للصنف
 DocType: Expense Claim,Total Sanctioned Amount,الإجمالي الكمية الموافق عليه
 ,Purchase Analytics,تحليلات المشتريات
 DocType: Sales Invoice Item,Delivery Note Item,ملاحظة تسليم السلعة
@@ -3154,7 +3154,7 @@
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",إذا تم تحديده، فإن القيمة المحددة أو المحسوبة في هذا المكون لن تساهم في الأرباح أو الاستقطاعات. ومع ذلك، فإنه يمكن الإشارة إلى القيمة من قبل المكونات الأخرى التي يمكن أن تضاف أو خصمها.
 ,Stock Ledger,سجل المخزن
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},معدل: {0}
-DocType: Company,Exchange Gain / Loss Account,صرف أرباح / حساب الخسارة
+DocType: Company,Exchange Gain / Loss Account,حساب خسائر او ارباح تحويلات
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,الموظف والحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,تعبئة النموذج وحفظه
@@ -3189,7 +3189,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",توجد مدخلات المخزون ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديله
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,أي طالب يتم العثور
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,الفاتورة تاريخ النشر
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,يبيع
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,باع
 DocType: Sales Invoice,Rounded Total,تقريب إجمالي
 DocType: Product Bundle,List items that form the package.,عناصر القائمة التي تشكل الحزمة.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,يجب أن تكون نسبة تخصيص تساوي 100 ٪
@@ -3201,7 +3201,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,انشئ زيارة صيانة
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
 DocType: Company,Default Cash Account,الحساب النقدي الافتراضي
-apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
+apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,(الشركة الأصليه ( ليست لعميل او مورد
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ويستند هذا على حضور هذا الطالب
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,لا يوجد طلاب في
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,إضافة المزيد من العناصر أو إستمارة كاملة مفتوح
@@ -3222,7 +3222,7 @@
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,تحقق من سعر البيع للالبند ضد سعر الشراء أو معدل التقييم
 DocType: Program,Fee Schedule,جدول التكاليف
 DocType: Hub Settings,Publish Availability,نشر توافر
-DocType: Company,Create Chart Of Accounts Based On,إنشاء مخطط من حسابات مبني على
+DocType: Company,Create Chart Of Accounts Based On,إنشاء دليل الحسابات معتمد علي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون أكبر مما هو عليه اليوم.
 ,Stock Ageing,الأسهم شيخوخة
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},طالب {0} موجودة ضد طالب طالب {1}
@@ -3240,7 +3240,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,حدد البرنامج لجلب دورات إلزامية.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,المسؤوليات
-DocType: Expense Claim Account,Expense Claim Account,حساب المطالبة النفقات
+DocType: Expense Claim Account,Expense Claim Account,حساب مطالبات  النفقات
 DocType: Sales Person,Sales Person Name,اسم رجل المبيعات
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,الرجاء إدخال الاقل فاتورة 1 في الجدول
 apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,إضافة مستخدمين
@@ -3251,7 +3251,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},إلى {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),الضرائب والرسوم المضافة (عملة الشركة)
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
-DocType: Sales Order,Partly Billed,وصفت جزئيا
+DocType: Sales Order,Partly Billed,تم فوترتها جزئيا
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,البند {0} يجب أن تكون ثابتة بند الأصول
 DocType: Item,Default BOM,الافتراضي BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
@@ -3260,7 +3260,7 @@
 DocType: Sales Invoice,Include Payment (POS),تشمل الدفع (POS)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
-DocType: Vehicle,Insurance Company,شركة تأمين
+DocType: Vehicle,Insurance Company,شركة التأمين
 DocType: Asset Category Account,Fixed Asset Account,حساب الأصول الثابتة
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,متغير
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,من التسليم ملاحظة
@@ -3269,7 +3269,7 @@
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,في المخزن:
 DocType: Notification Control,Custom Message,رسالة مخصصة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,اجباري حساب الخزنه او البنك لادخال المدفوعات
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,عنوان الطالب
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
 DocType: Purchase Invoice Item,Rate,معدل
@@ -3314,7 +3314,7 @@
 apps/erpnext/erpnext/config/selling.py +23,Customers,الزبائن
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,أوردر / كوت٪
 DocType: Student Sibling,Institution,مؤسسة
-DocType: Asset,Partially Depreciated,انخفضت جزئيا
+DocType: Asset,Partially Depreciated,استهلكت جزئيا
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية والبورصات
@@ -3343,7 +3343,7 @@
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ملخص إعدادات العمل اليومي
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},عملة قائمة الأسعار {0} ليست مماثلة مع العملة المختارة {1}
 DocType: Payment Entry,Internal Transfer,نقل داخلي
-apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,الحساب الفرعي موجود لهذا الحساب . لا يمكن الغاء الحساب.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
@@ -3379,7 +3379,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,إجمالي الحضور
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,القوائم المالية
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,الساعة
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +380,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
@@ -3388,7 +3388,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,غير معروف
 DocType: Shipping Rule,Shipping Rule Conditions,شروط قاعدة الشحن
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
-apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,نقطة بيع
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,نقااط البيع
 DocType: Payment Entry,Received Amount,المبلغ الوارد
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",إنشاء لكمية كاملة، وتجاهل كمية بالفعل على النظام
 DocType: Account,Tax,ضريبة
@@ -3408,10 +3408,10 @@
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,النسبة المئوية يسمح لك لتلقي أو تقديم المزيد من ضد الكمية المطلوبة. على سبيل المثال: إذا كنت قد أمرت 100 وحدة. و10٪ ثم يسمح بدل الخاص بك لتلقي 110 وحدة.
 DocType: POS Customer Group,Customer Group,مجموعة العميل
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),معرف الدفعة الجديد (اختياري)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},اجباري حساب النفقات للصنف {0}
 DocType: BOM,Website Description,وصف الموقع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,صافي التغير في حقوق المساهمين
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {0} لأول مرة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,فضلا  اشطب قاتورة المشتريات {0} أولا
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريدة من نوعها، موجود بالفعل ل{0}
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,إيصال
@@ -3451,7 +3451,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},من تاريخ {0} للموظف {1} لا يمكن أن يكون قبل تاريخ انضمامه {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,تجاري
 DocType: Payment Entry,Account Paid To,حساب مدفوع ل
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,البند الأصل {0} لا يجب أن يكون بند مخزون
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,جميع المنتجات أو الخدمات.
 DocType: Expense Claim,More Details,مزيد من التفاصيل
 DocType: Supplier Quotation,Supplier Address,عنوان المورد
@@ -3507,7 +3507,7 @@
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
 DocType: Guardian Interest,Guardian Interest,الجارديان الفائدة
 apps/erpnext/erpnext/config/hr.py +177,Training,التدريب
-DocType: Timesheet,Employee Detail,تفاصيل موظف
+DocType: Timesheet,Employee Detail,تفاصيل الموظف
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1 معرف البريد الإلكتروني
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,اليوم التالي التاريخ وكرر في يوم من شهر يجب أن يكون على قدم المساواة
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,إعدادات موقعه الإلكتروني
@@ -3553,7 +3553,7 @@
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مواصفات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,قالب الضرائب على المبيعات والرسوم
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),الإجمالي (الائتمان)
-DocType: Repayment Schedule,Payment Date,تاريخ الدفع
+DocType: Repayment Schedule,Payment Date,تاريخ الدفعة
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,جديد دفعة الكمية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,رقم الطلب
@@ -3588,7 +3588,7 @@
 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 +125,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
 DocType: Email Digest,Open Notifications,الإخطارات المفتوحة
-DocType: Payment Entry,Difference Amount (Company Currency),الفرق المبلغ (شركة العملات)
+DocType: Payment Entry,Difference Amount (Company Currency),فروق المبلغ ( عملة الشركة ) .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,المصاريف المباشرة
 apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} هو عنوان بريد إلكتروني غير صالح في &quot;إعلام \ عنوان البريد الإلكتروني&quot;
@@ -3792,7 +3792,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,العمل مقاولة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
-DocType: Employee,History In Company,تاريخه في الشركة
+DocType: Employee,History In Company,الحركة التاريخيه في الشركة
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,النشرات الإخبارية
 DocType: Stock Ledger Entry,Stock Ledger Entry,حركة سجل المخزن
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
@@ -3866,7 +3866,7 @@
 DocType: Employee Loan,Repay Fixed Amount per Period,سداد مبلغ ثابت في الفترة
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,تاريخ عمل الموظف خارج الشركة
-DocType: Tax Rule,Purchase,شراء
+DocType: Tax Rule,Purchase,الشراء
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,الكمية المتاحة
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,الأهداف لا يمكن أن تكون فارغة
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
@@ -3958,7 +3958,7 @@
 DocType: BOM,Rate Of Materials Based On,معدل المواد التي تقوم على
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics الدعم
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,الغاء الكل
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +28,Company is missing in warehouses {0},شركة مفقود في المستودعات {0}
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +28,Company is missing in warehouses {0},الشركة ناقصة في المستودعات  {0}
 DocType: POS Profile,Terms and Conditions,الشروط والأحكام
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك ادراج تفاصيل عن الحالة الصحية مثل الطول والوزن، الحساسية، المخاوف الطبية
@@ -4069,7 +4069,7 @@
 DocType: HR Settings,Payroll Settings,إعدادات دفع الرواتب
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,طلب مكان
-DocType: Email Digest,New Purchase Orders,أوامر الشراء الجديدة
+DocType: Email Digest,New Purchase Orders,اوامر الشراء الجديده
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,الجذر لا يمكن أن يكون مركز تكلفة الأصل
 apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,اختر الماركة ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,مجمع الإستهلاك كما في
@@ -4081,7 +4081,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
 DocType: Program,Program Abbreviation,اختصار برنامج
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,يتم تحديث الرسوم في شراء استلام ضد كل بند
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,تحديث الرسوم في اضافة المشتريات لكل صنف
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Bank Guarantee,Start Date,تاريخ البدء
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,تخصيص الإجازات لفترة.
@@ -4181,7 +4181,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مدخلات لم تتم تسويتها
 DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
-apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون عملة الفواتير تساوي عملة الشركة او عملة حساب الطرف
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,عملة الفاتوره يجب ان تساوي عملة الشركة المعتاد او عملة الحساب GL الرئيسي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,إجازات صرفت نقدا
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,مجال عمل الشركة؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,لمستودع
@@ -4214,7 +4214,7 @@
 DocType: Attendance,Present,حاضر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا تكون مسجلة
 DocType: Notification Control,Sales Invoice Message,فاتورة مبيعات رسالة
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,إغلاق حساب {0} يجب أن يكون من نوع المسؤولية / حقوق المساهمين
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,حساب الأقفال {0} يجب ان يكون نوعه خصوم  / حقوق الملكيه
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},كشف راتب الموظف {0} تم إنشاؤه مسبقا على سجل التوقيت {1}
 DocType: Vehicle Log,Odometer,عداد المسافات
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
@@ -4227,7 +4227,7 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,إنشاء كشوفات الرواتب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,آخر سعر شراء لم يتم العثور على
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,سعر اخر شراء غير موجود
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعات الفواتير
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM الافتراضي ل{0} لم يتم العثور
@@ -4237,7 +4237,7 @@
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} هو طالب غير نشط
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} طالب غير نشط
 DocType: Employee,Health Details,تفاصيل الحالة الصحية
 DocType: Offer Letter,Offer Letter Terms,شروط عرض عمل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,لإنشاء مستند مرجع طلب الدفع مطلوب
@@ -4246,7 +4246,7 @@
 DocType: Serial No,Delivery Document Type,تسليم الوثيقة نوع
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,الموافقة علي جميع كشوفات الرواتب حسب المعايير المذكورة أعلاه
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} عناصر مزامن
-DocType: Sales Order,Partly Delivered,هذه جزئيا
+DocType: Sales Order,Partly Delivered,سلمت جزئيا
 DocType: Email Digest,Receivables,المستحقات
 DocType: Lead Source,Lead Source,مصدر مبادرة البيع
 DocType: Customer,Additional information regarding the customer.,معلومات إضافية عن العميل.
@@ -4269,7 +4269,7 @@
 DocType: Manufacturing Settings,Manufacturing Settings,إعدادات التصنيع
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,إعداد البريد الإلكتروني
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Guardian1 رقم الجوال
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة ماستر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,فضلا ادخل العملة المعتاده في الشركة الرئيسيه
 DocType: Stock Entry Detail,Stock Entry Detail,تفاصيل ادخال المخزون
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,تذكير اليومية
 DocType: Products Settings,Home Page is Products,الصفحة الرئيسية المنتجات غير
@@ -4436,24 +4436,24 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,العملاء في قائمة الانتظار
 DocType: Student,Nationality,جنسية
 ,Items To Be Requested,البنود يمكن طلبه
-DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر تسعيرة شراء
+DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Company,Company Info,معلومات عن الشركة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,تحديد أو إضافة عميل جديد
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,مطلوب مراكز التكلفة لحجز مطالبة حساب
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,مركز التكلفة مطلوب لدفتر طلب المصروفات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ويستند هذا على حضور هذا الموظف
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,حساب الخصم
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,لا يمكن اخفاء المجموعه لأن نوع الحساب تم اختياره من قبل .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,شراء المبلغ
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,مبلغ الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
 apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,فوائد الموظف
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},الكمية المعبأة يجب أن تساوي كمية المادة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} وشركة {1}
@@ -4462,7 +4462,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 DocType: Maintenance Schedule,Schedule,جدول
-DocType: Account,Parent Account,الأصل حساب
+DocType: Account,Parent Account,الحساب الأصل
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
@@ -4501,7 +4501,7 @@
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,مجموع الضرائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
-DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
+DocType: Purchase Invoice,Net Total (Company Currency),صافي الأجمالي ( بعملة الشركة )
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,تاريخ نهاية السنة لا يمكن أن يكون أقدم من تاريخ بداية السنة. يرجى تصحيح التواريخ وحاول مرة أخرى.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
@@ -4578,13 +4578,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,لا يمكن تحرير الجذر.
 DocType: Item,Units of Measure,وحدات القياس
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
-DocType: Sales Order,Customer's Purchase Order Date,تاريخ طلب شراء العميل
+DocType: Sales Order,Customer's Purchase Order Date,تاريخ امر الشراء العميل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,أسهم رأس المال
 DocType: Shopping Cart Settings,Show Public Attachments,عرض المرفقات العامة
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
 DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب البوابة
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,اعاده توجيه المستخدم الى الصفحات المحدده بعد اكتمال عمليه الدفع
-DocType: Company,Existing Company,الشركة القائمة
+DocType: Company,Existing Company,الشركة القائمه
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,يرجى تحديد ملف CSV
 DocType: Student Leave Application,Mark as Present,إجعلها الحاضر
 DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
@@ -4595,7 +4595,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Program,Program Code,رمز البرنامج
 DocType: Terms and Conditions,Terms and Conditions Help,الشروط والأحكام مساعدة
-,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
+,Item-wise Purchase Register,سجل حركة المشتريات وفقا للصنف
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
 ,Supplier Addresses and Contacts,العناوين المورد و اتصالات
 ,accounts-browser,متصفح الحسابات
@@ -4619,7 +4619,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,المرجع التسجيل
 DocType: Employee,Reason for Leaving,سبب ترك العمل
-DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل (شركة العملات)
+DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل ( بعملة الشركة )
 DocType: Employee Loan Application,Rate of Interest,معدل الفائدة
 DocType: Expense Claim Detail,Sanctioned Amount,القيمة المقرر صرفه
 DocType: GL Entry,Is Opening,وفتح
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index b223ea0..48c5f2f 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -3358,7 +3358,7 @@
 DocType: BOM,Website Description,Hjemmesidebeskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoændring i Equity
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresse skal være unikt, findes allerede for {0}"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadresse skal være unik, findes allerede for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Kvittering
 ,Sales Register,Salgs Register
@@ -3834,7 +3834,7 @@
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Tax Rule,Sales Tax Template,Salg Afgift Skabelon
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Vælg elementer for at gemme fakturaen
-DocType: Employee,Encashment Date,Indløsning Dato
+DocType: Employee,Encashment Date,Indløsningsdato
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitets Omkostninger findes for Aktivitets Type - {0}
@@ -4478,7 +4478,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettoløn kan ikke være negativ
 DocType: SMS Settings,Static Parameters,Statiske parametre
 DocType: Assessment Plan,Room,Værelse
-DocType: Purchase Order,Advance Paid,Advance Betalt
+DocType: Purchase Order,Advance Paid,Forudbetalt
 DocType: Item,Item Tax,Varemoms
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiale til leverandøren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Skattestyrelsen Faktura
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index fa19765..9c985eb 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -622,7 +622,7 @@
 apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Zur Knowledge Base hinzufügen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Verfassen von Angeboten
-DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlung Eintrag Abzug
+DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlungsabzug
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ein weiterer Vertriebsmitarbeiter {0} existiert bereits mit der gleichen Mitarbeiter ID
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Wenn diese Option aktiviert, Rohstoffe für Gegenstände, die Unteraufträge sind in den Materialwünsche aufgenommen werden"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Stämme
@@ -659,7 +659,7 @@
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Beziehung mit Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Leiter
-DocType: Payment Entry,Payment From / To,Die Zahlung von / bis
+DocType: Payment Entry,Payment From / To,Zahlung von / an
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
@@ -907,7 +907,7 @@
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Expense Claim,Expenses,Ausgaben
 DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut
-,Purchase Receipt Trends,Trandanalyse Kaufbelege
+,Purchase Receipt Trends,Trendanalyse Kaufbelege
 DocType: Process Payroll,Bimonthly,Zweimonatlich
 DocType: Vehicle Service,Brake Pad,Bremsklotz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Forschung & Entwicklung
@@ -923,7 +923,7 @@
 DocType: Production Planning Tool,Only Obtain Raw Materials,Erhalten Sie nur Rohstoffe
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Mitarbeiterbeurteilung
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivieren &quot;Verwendung für Einkaufswagen&quot;, wie Einkaufswagen aktiviert ist und es sollte mindestens eine Steuerregel für Einkaufswagen sein"
-apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung Eintrag {0} ist gegen die Ordnung verknüpft {1}, überprüfen, ob es als Fortschritt in dieser Rechnung gezogen werden sollte."
+apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung {0} ist mit der Bestellung {1} verknüpft, überprüfen Sie bitte, ob es als Anteil in dieser Rechnung gezogen werden sollte."
 DocType: Sales Invoice Item,Stock Details,Lagerdetails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Verkaufsstelle
@@ -1435,7 +1435,7 @@
 DocType: Appraisal,Goals,Ziele
 DocType: Warranty Claim,Warranty / AMC Status,Status der Garantie / des jährlichen Wartungsvertrags
 ,Accounts Browser,Kontenbrowser
-DocType: Payment Entry Reference,Payment Entry Reference,Zahlung Eintrag Referenz
+DocType: Payment Entry Reference,Payment Entry Reference,Zahlungsreferenz
 DocType: GL Entry,GL Entry,Buchung zum Hauptbuch
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Chargenbezogener Bestandsverlauf
@@ -2335,7 +2335,7 @@
 DocType: Student,Joining Date,Beitrittsdatum
 ,Employees working on a holiday,Die Mitarbeiter an einem Feiertag arbeiten
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Anwesend setzen
-DocType: Project,% Complete Method,% Abgeschlossen Methode
+DocType: Project,% Complete Method,% abgeschlossene Methode
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
 DocType: Production Order,Actual End Date,Tatsächliches Enddatum
 DocType: BOM,Operating Cost (Company Currency),Betriebskosten (Gesellschaft Währung)
@@ -2459,10 +2459,10 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
-DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenztag
+DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenzdatum
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
 DocType: Employee,Emergency Contact,Notfallkontakt
-DocType: Bank Reconciliation Detail,Payment Entry,Zahlung Eintrag
+DocType: Bank Reconciliation Detail,Payment Entry,Zahlung
 DocType: Item,Quality Parameters,Qualitätsparameter
 ,sales-browser,Umsatz-Browser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Hauptbuch
@@ -2504,7 +2504,7 @@
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorherige
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
 apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
-DocType: Payment Entry,Total Allocated Amount,Insgesamt Geschätzter Betrag
+DocType: Payment Entry,Total Allocated Amount,Insgesamt geschätzter Betrag
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journaleintrag für die Gehälter von {0} {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Localstorage voll ist, nicht speichern"
@@ -3446,7 +3446,7 @@
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},"Mitarbeiter Von Datum {0} für {1} kann nicht sein, bevor Mitarbeiter-Beitritt Datum {2}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Werbung
-DocType: Payment Entry,Account Paid To,Konto zu über
+DocType: Payment Entry,Account Paid To,Eingangskonto
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle Produkte oder Dienstleistungen
 DocType: Expense Claim,More Details,Weitere Details
@@ -3492,7 +3492,7 @@
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Entweder Debit- oder Kreditbetrag ist erforderlich für {2}
 DocType: GL Entry,Remarks,Bemerkungen
-DocType: Payment Entry,Account Paid From,Konto einzuzahlen Aus
+DocType: Payment Entry,Account Paid From,Ausgangskonto
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,neue Verkaufsanfrage
@@ -3634,7 +3634,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Benutzer {0} existiert nicht
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Rohmaterial kann nicht dasselbe sein wie der Hauptartikel
 DocType: Item Attribute Value,Abbreviation,Abkürzung
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,Zahlung Eintrag existiert bereits
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,Zahlung existiert bereits
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Stammdaten zur Gehaltsvorlage
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
@@ -4232,7 +4232,7 @@
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Bitte {0} setzen
 DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} ist inaktiver Schüler
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} ist ein inaktiver Schüler
 DocType: Employee,Health Details,Gesundheitsdaten
 DocType: Offer Letter,Offer Letter Terms,Gültigkeit des Angebotsschreibens
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,Zur Erstellung eines Zahlungsauftrags ist ein Referenzdokument erforderlich
@@ -4424,7 +4424,7 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Zahlungsnachweis
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Kunden. Siehe Zeitleiste unten für Details
 DocType: Supplier,Credit Days Based On,Zahlungsziel basierend auf
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Geschätzter Betrag {1} muss kleiner als oder gleich zu Zahlung Eintrag Menge {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Zeile {0}: Zugewiesener Betrag {1} muss kleiner oder gleich der Zahlungsmenge {2} sein
 DocType: Tax Rule,Tax Rule,Steuer-Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 87dd255..39aec67 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -43,7 +43,7 @@
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar abiertos
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Secuencia actualizada correctamente
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Revisa
+apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Pedido
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Entrada de Diario por Devengo Enviada
 DocType: Pricing Rule,Apply On,Aplicar en
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
@@ -76,7 +76,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año Fiscal {0} es necesario
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Fecha de entrega esperada es siempre delante de órdenes de venta Fecha
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Fecha de entrega esperada es siempre antes de la fecha de órdenes de venta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Salary Component,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
@@ -108,7 +108,7 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en cualquier año fiscal activa.
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, código del artículo: {1} y cliente: {2}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, Código del Artículo: {1} y Cliente: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogramo
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
@@ -293,7 +293,7 @@
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitudes de compra.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Esto se basa en la tabla de tiempos creada en contra de este proyecto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,Pay Net no puede ser menor que 0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,Pago Neto no puede ser menor que 0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Ausencias por año
@@ -416,7 +416,7 @@
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
-DocType: Maintenance Visit,Maintenance Type,Tipo de mantenimiento
+DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demostración ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Añadir los artículos
@@ -464,7 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y precios
 DocType: Delivery Note,% Installed,% Instalado
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las clases se pueden programar."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor &gt; Tipo de proveedor
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lea el Manual ERPNext
@@ -556,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incremento no puede ser 0
 DocType: Production Planning Tool,Material Requirement,Solicitud de material
 DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,No de referencia y fecha de referencia es obligatoria para las transacciones bancarias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
@@ -569,7 +569,7 @@
 DocType: Budget,Ignore,Pasar por alto
 apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} no está activo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensiones de verificación de configuración para la impresión
+apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurar dimensiones de cheque para la impresión
 DocType: Salary Slip,Salary Slip Timesheet,Registro de Horas de Nómina
 apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
 DocType: Pricing Rule,Valid From,Válido desde
@@ -653,7 +653,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra"
 DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por
 DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado
-DocType: Maintenance Schedule,Maintenance Schedule,Calendario de mantenimiento
+DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Cambio neto en el inventario
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Administración de Préstamos de Empleado
@@ -773,7 +773,7 @@
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nómina mensual.
 DocType: BOM,Website Specifications,Especificaciones del sitio web
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración&gt; Serie de numeración
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración &gt; Serie de numeración
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
@@ -827,7 +827,7 @@
 DocType: Employee,Bank A/C No.,Núm. de cta. bancaria
 DocType: Bank Guarantee,Project,Proyecto
 DocType: Quality Inspection Reading,Reading 7,Lectura 7
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,parcialmente ordenado
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Parcialmente Ordenado
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para carrito de compras
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Activos desechado a través de entrada de diario {0}
@@ -1335,7 +1335,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Sólo puede existir una 'regla de envió' con valor 0 o valor en blanco en 'para el valor'
 DocType: Authorization Rule,Transaction,Transacción
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: este centro de costes es una categoría. No se pueden crear asientos contables en las categorías.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,existe almacén niño para este almacén. No se puede eliminar este almacén.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,No se puede eliminar este almacén. Existe almacén hijo para este almacén.
 DocType: Item,Website Item Groups,Grupos de productos en el sitio web
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
@@ -1407,7 +1407,7 @@
 DocType: Holiday List,Holidays,Vacaciones
 DocType: Sales Order Item,Planned Quantity,Cantidad planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
-DocType: Item,Maintain Stock,Mantener stock
+DocType: Item,Maintain Stock,Mantener Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 DocType: Employee,Prefered Email,Correo electrónico  preferido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Cambio neto en activos fijos
@@ -1522,7 +1522,7 @@
 DocType: Landed Cost Voucher,Additional Charges,Cargos adicionales
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,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
+DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 DocType: Student,Leaving Certificate Number,Dejando Número de Certificado
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantidad de lotes disponibles en almacén
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Formato de impresión de actualización
@@ -1540,7 +1540,7 @@
 DocType: Expense Claim,EXP,EXP
 apps/erpnext/erpnext/config/stock.py +200,Brand master.,Marca principal
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiante {0} - {1} aparece múltiples veces en fila {2} y {3}
-DocType: Program Enrollment Tool,Program Enrollments,Las inscripciones del programa
+DocType: Program Enrollment Tool,Program Enrollments,Inscripciones del Programa
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
@@ -1850,7 +1850,7 @@
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
-DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
+DocType: Maintenance Visit,Maintenance Time,Tiempo del Mantenimiento
 ,Amount to Deliver,Cantidad para envío
 apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Un Producto o Servicio
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Plazo Fecha de inicio no puede ser anterior a la fecha de inicio de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
@@ -1938,7 +1938,7 @@
 DocType: Asset,Purchase Date,Fecha de compra
 DocType: Employee,Personal Details,Datos personales
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
-,Maintenance Schedules,Programas de mantenimiento
+,Maintenance Schedules,Programas de Mantenimiento
 DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
 ,Quotation Trends,Tendencias de Presupuestos
@@ -2103,7 +2103,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Fila # {0}: Activo {1} ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Órdenes de venta a pagar
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} mediante Configuración&gt; Configuración&gt; Nombrar Series
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} mediante Configuración &gt; Configuración &gt; Nombrar Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Por favor, seleccione la cuenta correcta"
@@ -2201,7 +2201,7 @@
 DocType: SMS Log,Sent To,Enviado a
 DocType: Payment Request,Make Sales Invoice,Crear factura de venta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Siguiente Contactar La fecha no puede ser en el pasado
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Siguiente Fecha de Contacto no puede ser en el pasado
 DocType: Company,For Reference Only.,Sólo para referencia.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Seleccione Lote No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No válido {0}: {1}
@@ -2222,7 +2222,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
 DocType: Item,End of Life,Final de vida útil
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,Viajes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura activa o salario por defecto encontrado de empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura de salario activa o por defecto encontrada de empleado {0} para las fechas indicadas
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
@@ -2414,7 +2414,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Por siguiente Contacto no puede ser la misma que la de plomo Dirección de correo electrónico
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,"Siguiente contacto por, no puede ser el mismo que la  dirección de correo electrónico de la Iniciativa"
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Cuenta Nómina Componente
@@ -2433,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Fecha de liquidación no definida
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producción
 DocType: Guardian,Occupation,Ocupación
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure el sistema de nombres de empleado en recursos humanos&gt; Configuración de recursos humanos"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure el sistema de nombres de empleado en recursos humanos &gt; Configuración de recursos humanos"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Sales Invoice,This Document,Este documento
@@ -2479,7 +2479,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,No pago y no entregado
 DocType: Product Bundle,Parent Item,Producto padre / principal
-DocType: Account,Account Type,Tipo de cuenta
+DocType: Account,Account Type,Tipo de Cuenta
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,No hay hojas de tiempo
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deja tipo {0} no se pueden reenviar-llevar
@@ -2834,7 +2834,7 @@
 DocType: Employee Attendance Tool,Employee Attendance Tool,Herramienta de asistencia de los empleados
 DocType: Guardian Student,Guardian Student,Tutor del Estudiante
 DocType: Supplier,Credit Limit,Límite de crédito
-DocType: Production Plan Sales Order,Salse Order Date,Salse Fecha del pedido
+DocType: Production Plan Sales Order,Salse Order Date,Fecha de Orden de Venta
 DocType: Salary Component,Salary Component,Componente Salarial
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Las entradas de pago {0} estan no-relacionadas
 DocType: GL Entry,Voucher No,Comprobante No.
@@ -3002,7 +3002,7 @@
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","se requiere la reparación de artículos, tipo, frecuencia y cantidad de gastos"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},¿De verdad quieres que presenten todos nómina de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},¿De verdad quieres que presenten todas las nóminas de {0} a {1}
 DocType: Cheque Print Template,Cheque Height,Altura de Cheque
 DocType: Supplier,Supplier Details,Detalles del proveedor
 DocType: Expense Claim,Approval Status,Estado de Aprobación
@@ -3090,7 +3090,7 @@
 DocType: Topic,Topic Name,Nombre del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccione la naturaleza de su negocio.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Duplicar entrada en Referencias {1} {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Entrada duplicada en Referencias {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
 DocType: Asset Movement,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de instalación
@@ -3354,7 +3354,7 @@
 DocType: Issue,Raised By (Email),Propuesto por (Email)
 DocType: Training Event,Trainer Name,Nombre del entrenador
 DocType: Mode of Payment,General,General
-apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar membrete
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar Membrete
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última Comunicación
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
@@ -3791,7 +3791,7 @@
 DocType: Employee,History In Company,Historia en la Compañia
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Boletines
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente &gt; Grupo de clientes &gt; Territorio
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,El mismo artículo se ha introducido varias veces
 DocType: Department,Leave Block List,Dejar lista de bloqueo
 DocType: Sales Invoice,Tax ID,ID de impuesto
@@ -4061,7 +4061,7 @@
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cantidad real (en origen/destino)
 DocType: Item Customer Detail,Ref Code,Código de referencia
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de los empleados.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, establece la Siguiente Fecha de Depreciación"
 DocType: HR Settings,Payroll Settings,Configuración de nómina
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Realizar pedido
@@ -4206,7 +4206,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
 DocType: Timesheet,Production Detail,Detalle de Producción
 DocType: Target Detail,Target Qty,Cantidad estimada
-DocType: Shopping Cart Settings,Checkout Settings,Pedido Ajustes
+DocType: Shopping Cart Settings,Checkout Settings,Ajustes del Pedido
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
 DocType: Notification Control,Sales Invoice Message,Mensaje de factura
@@ -4247,7 +4247,7 @@
 DocType: Lead Source,Lead Source,Fuente de de la Iniciativa
 DocType: Customer,Additional information regarding the customer.,Información adicional referente al cliente.
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
-DocType: Maintenance Visit,Maintenance Date,Fecha de mantenimiento
+DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Invoice Item,Rejected Serial No,No. de serie rechazado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Fecha de inicio de año o fecha de finalización  de año está traslapando con {0}. Para evitar porfavor establezca empresa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index ce8e68f..4f0268a 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -464,7 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Taux
 DocType: Delivery Note,% Installed,% Installé
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Les Salles de Classe / Laboratoires etc. où des conférences peuvent être programmées.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de Fournisseur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Veuillez d’abord entrer le nom de l'entreprise
 DocType: Purchase Invoice,Supplier Name,Nom du Fournisseur
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lire le manuel d’ERPNext
@@ -480,7 +480,7 @@
 DocType: Account,Old Parent,Grand Parent
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Champ Obligatoire - Année Académique
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui fera partie de cet Email. Chaque transaction a une introduction séparée.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Veuillez définir le compte payé par défaut pour la société {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Veuillez définir le compte créditeur par défaut pour la société {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes Gelés Jusqu'au
 DocType: SMS Log,Sent On,Envoyé le
@@ -773,7 +773,7 @@
 DocType: Opportunity,Opportunity From,Opportunité De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de paie mensuelle.
 DocType: BOM,Website Specifications,Spécifications du Site Web
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numérotation pour la présence via Configuration&gt; Série de numérotation
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la numérotation de série pour la Présence via Configuration&gt; Numérotation de Série
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} : Du {0} de type {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Ligne {0} : Le Facteur de Conversion est obligatoire
@@ -1635,7 +1635,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Faire une Écriture de Décaissement
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ligne {0} : L’Avance du Fournisseur doit être un débit
 DocType: Company,Default Values,Valeurs Par Défaut
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,Rapport {Frequency}
 DocType: Expense Claim,Total Amount Reimbursed,Montant Total Remboursé
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Basé sur les journaux de ce Véhicule. Voir la chronologie ci-dessous pour plus de détails
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collecte
@@ -2105,7 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Ligne #{0} : L’Actif {1} est déjà {2}
 DocType: Quotation Item,Stock Balance,Solde du Stock
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,De la Commande Client au Paiement
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez configurer Naming Series pour {0} via Setup&gt; Paramètres&gt; Naming Series
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir le Nom de Série pour {0} via Setup&gt; Paramètres&gt; Nom de Série
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,PDG
 DocType: Expense Claim Detail,Expense Claim Detail,Détail Note de Frais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Veuillez sélectionner un compte correct
@@ -2435,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Date de Compensation non indiquée
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Production
 DocType: Guardian,Occupation,Occupation
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le Système de Nommage des Employés depuis Ressources Humaines&gt; Paramètres RH
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ligne {0} : La Date de Début doit être avant la Date de Fin
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qté)
 DocType: Sales Invoice,This Document,Ce Document
@@ -3015,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,Facture Ref
 DocType: Purchase Order,Recurring Order,Commande Récurrente
 DocType: Company,Default Income Account,Compte de Produits par Défaut
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Groupe de Client / Client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Groupe de Clients / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Bénéfice / Perte (Crédit) des Exercices Non Clos
 DocType: Sales Invoice,Time Sheets,Feuilles de Temps
 DocType: Payment Gateway Account,Default Payment Request Message,Message de Demande de Paiement par Défaut
@@ -3092,7 +3092,7 @@
 DocType: Topic,Topic Name,Nom du Sujet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Au moins Vente ou Achat doit être sélectionné
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Sélectionner la nature de votre entreprise.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: entrée en double dans les références {1} {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Ligne # {0}: entrée en double dans les références {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Là où les opérations de fabrication sont réalisées.
 DocType: Asset Movement,Source Warehouse,Entrepôt Source
 DocType: Installation Note,Installation Date,Date d'Installation
@@ -3234,7 +3234,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
 DocType: Purchase Order,Customer Contact Email,Email Contact Client
 DocType: Warranty Claim,Item and Warranty Details,Détails de l'Article et de la Garantie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code d'Article&gt; Groupe d'Articles&gt; Marque
 DocType: Sales Team,Contribution (%),Contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Sélectionner le Programme pour obtenir les cours obligatoires.
@@ -3405,7 +3405,7 @@
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Rapport de visite pour appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mettre à Jour le Prix et la Disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou à livrer en plus de la quantité commandée. Par exemple : Si vous avez commandé 100 unités et que votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
-DocType: POS Customer Group,Customer Group,Groupe de clients
+DocType: POS Customer Group,Customer Group,Groupe de Clients
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nouveau Numéro de Lot (Optionnel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Compte de charge est obligatoire pour l'article {0}
 DocType: BOM,Website Description,Description du Site Web
@@ -3793,7 +3793,7 @@
 DocType: Employee,History In Company,Ancienneté dans la Société
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Stock Ledger Entry,Stock Ledger Entry,Écriture du Livre d'Inventaire
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de Clients&gt; Territoire
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Le même article a été saisi plusieurs fois
 DocType: Department,Leave Block List,Liste de Blocage des Congés
 DocType: Sales Invoice,Tax ID,Numéro d'Identification Fiscale
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 685f081..315a4a1 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -569,7 +569,7 @@
 DocType: Budget,Ignore,Ignora
 apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} non è attivo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
-apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensioni di controllo di configurazione per la stampa
+apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurazione Dimensioni Assegno per la stampa
 DocType: Salary Slip,Salary Slip Timesheet,Stipendio slittamento Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per ricevuta d'acquisto del conto lavoro
 DocType: Pricing Rule,Valid From,valido dal
@@ -934,7 +934,7 @@
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
 DocType: Notification Control,Expense Claim Rejected Message,Messaggio Rimborso Spese Rifiutato
 ,Available Qty,Disponibile Quantità
-DocType: Purchase Taxes and Charges,On Previous Row Total,Sul Fila Indietro totale
+DocType: Purchase Taxes and Charges,On Previous Row Total,Sulla riga totale precedente
 DocType: Purchase Invoice Item,Rejected Qty,Quantità Rifiutato
 DocType: Salary Slip,Working Days,Giorni lavorativi
 DocType: Serial No,Incoming Rate,Tasso in ingresso
@@ -1056,7 +1056,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
 DocType: Student Batch Name,Student Batch Name,Studente Batch Nome
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
-DocType: Repayment Schedule,Balance Loan Amount,Saldo del prestito Importo
+DocType: Repayment Schedule,Balance Loan Amount,Importo del prestito di bilancio
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Programma del corso
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
@@ -2461,7 +2461,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
-DocType: Payment Entry,Cheque/Reference Date,Assegno / Reference Data
+DocType: Payment Entry,Cheque/Reference Date,Assegno / Data di riferimento
 DocType: Purchase Invoice,Total Taxes and Charges,Totale imposte e oneri
 DocType: Employee,Emergency Contact,Contatto di emergenza
 DocType: Bank Reconciliation Detail,Payment Entry,Contabilizza pagamento
@@ -2886,7 +2886,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Importo versato non può essere maggiore di totale importo residuo negativo {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Chiusura (Dr)
-DocType: Cheque Print Template,Cheque Size,Assegno Size
+DocType: Cheque Print Template,Cheque Size,Dimensione Assegno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} non in magazzino
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modelli fiscali per le transazioni di vendita.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrivi Off eccezionale Importo
@@ -3004,7 +3004,7 @@
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Servizio Voce, tipo, la frequenza e la quantità spesa sono necessari"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Vuoi davvero confermare tutte le buste paga da {0} a {1}
-DocType: Cheque Print Template,Cheque Height,Assegno Altezza
+DocType: Cheque Print Template,Cheque Height,Altezza Assegno
 DocType: Supplier,Supplier Details,Dettagli del Fornitore
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
@@ -3159,7 +3159,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Compila il modulo e salva
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Scaricare un report contenete tutte le materie prime con il loro recente stato di inventario
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantità in stock
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantità disponibile
 DocType: Homepage,"URL for ""All Products""",URL per &quot;tutti i prodotti&quot;
 DocType: Leave Application,Leave Balance Before Application,Lascia bilancio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
@@ -3228,7 +3228,7 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +245,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
-DocType: Cheque Print Template,Scanned Cheque,Scanned Assegno
+DocType: Cheque Print Template,Scanned Cheque,Assegno scansionato
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica ai contatti alla conferma.
 DocType: Timesheet,Total Billable Amount,Importo totale fatturabile
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Articolo 3
@@ -3295,7 +3295,7 @@
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
-DocType: Purchase Invoice,Print Language,Stampa Lingua
+DocType: Purchase Invoice,Print Language,Lingua di Stampa
 DocType: Salary Slip,Total Working Hours,Orario di lavoro totali
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Inserire il valore deve essere positivo
@@ -3329,7 +3329,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow operativo
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
 DocType: Manufacturer,Limited to 12 characters,Limitato a 12 caratteri
-DocType: Journal Entry,Print Heading,Stampa Rubrica
+DocType: Journal Entry,Print Heading,Titolo di stampa
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Totale non può essere zero
 DocType: Training Event Employee,Attended,Frequentato
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Giorni dall'ultimo Ordine' deve essere maggiore o uguale a zero
@@ -3550,7 +3550,7 @@
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
 DocType: Sales Invoice,Terms and Conditions Details,Termini e condizioni dettagli
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specificazioni
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli Tasse di Vendita e Oneri
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli di Imposte e spese di vendita
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Totale (Credito)
 DocType: Repayment Schedule,Payment Date,Data di Pagamento
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nuovo Batch Qty
@@ -3580,7 +3580,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
 DocType: Vehicle,Last Carbon Check,Ultima verifica carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Spese legali
-DocType: Purchase Invoice,Posting Time,Tempo Distacco
+DocType: Purchase Invoice,Posting Time,Ora di Spedizione
 DocType: Timesheet,% Amount Billed,% Importo Fatturato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Spese telefoniche
 DocType: Sales Partner,Logo,Logo
@@ -3784,7 +3784,7 @@
 DocType: Opportunity,Opportunity Date,Data Opportunità
 DocType: Purchase Receipt,Return Against Purchase Receipt,Di ritorno contro RICEVUTA
 DocType: Request for Quotation Item,Request for Quotation Item,Richiesta di offerta Articolo
-DocType: Purchase Order,To Bill,Per Bill
+DocType: Purchase Order,To Bill,Da Fatturare
 DocType: Material Request,% Ordered,% Ordinato
 DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Inserire l&#39;indirizzo e-mail separati da virgole, fattura sarà inviata automaticamente particolare data"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,lavoro a cottimo
@@ -4118,7 +4118,7 @@
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Aggiungi / Modifica prezzi
 DocType: Batch,Parent Batch,Parte Batch
-DocType: Cheque Print Template,Cheque Print Template,Assegno modello di stampa
+DocType: Cheque Print Template,Cheque Print Template,Modello di stampa dell'Assegno
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafico Centro di Costo
 ,Requested Items To Be Ordered,Elementi richiesti da ordinare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Magazzino aziendale deve essere uguale all account aziendale
@@ -4517,7 +4517,7 @@
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,Operazione BOM
 DocType: School Settings,Validate the Student Group from Program Enrollment,Validare il gruppo studente dall&#39;iscrizione al programma
-DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul Fila Indietro Importo
+DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul valore della riga precedente
 DocType: Student,Home Address,Indirizzo
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Trasferimento Asset
 DocType: POS Profile,POS Profile,POS Profilo
@@ -4532,7 +4532,7 @@
 DocType: SMS Settings,Static Parameters,Parametri statici
 DocType: Assessment Plan,Room,Camera
 DocType: Purchase Order,Advance Paid,Anticipo versato
-DocType: Item,Item Tax,Tax articolo
+DocType: Item,Item Tax,Tasse dell'Articolo
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiale al Fornitore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Accise Fattura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Soglia {0}% appare più di una volta
@@ -4571,7 +4571,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Carrello è Vuoto
 DocType: Vehicle,Model,Modello
 DocType: Production Order,Actual Operating Cost,Costo operativo effettivo
-DocType: Payment Entry,Cheque/Reference No,Assegno / di riferimento
+DocType: Payment Entry,Cheque/Reference No,Assegno / N. di riferimento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root non può essere modificato .
 DocType: Item,Units of Measure,Unità di misura
 DocType: Manufacturing Settings,Allow Production on Holidays,Consentire una produzione su Holidays
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 24a234d..6b49d6e 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -58,7 +58,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankcheque
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Toon Varianten
-DocType: Academic Term,Academic Term,academische Term
+DocType: Academic Term,Academic Term,Academisch semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Hoeveelheid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Accounts tabel mag niet leeg zijn.
@@ -737,7 +737,7 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 DocType: Hub Settings,Seller City,Verkoper Stad
-,Absent Student Report,Absent Student Report
+,Absent Student Report,Studenten afwezigheidsrapport
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
 apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Item heeft varianten.
@@ -2762,7 +2762,7 @@
 DocType: Training Event,Scheduled,Geplande
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Aanvraag voor een offerte.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Selecteer Item, waar &quot;Is Stock Item&quot; is &quot;Nee&quot; en &quot;Is Sales Item&quot; is &quot;Ja&quot; en er is geen enkel ander product Bundle"
-DocType: Student Log,Academic,Academic
+DocType: Student Log,Academic,Academisch
 apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
@@ -3680,7 +3680,7 @@
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child nodes kunnen alleen worden gemaakt op grond van het type nodes &#39;Groep&#39;
 DocType: Leave Application,Half Day Date,Halve dag Date
-DocType: Academic Year,Academic Year Name,Academisch Jaar Naam
+DocType: Academic Year,Academic Year Name,Academisch jaar naam
 DocType: Sales Partner,Contact Desc,Contact Omschr
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type verloven zoals, buitengewoon, ziekte, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Stuur regelmatige samenvattende rapporten via e-mail.
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 2980247d..dca5751 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -63,7 +63,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Кредити (зобов&#39;язання)
-DocType: Employee Education,Year of Passing,Рік Passing
+DocType: Employee Education,Year of Passing,Рік проходження
 DocType: Item,Country of Origin,Країна народження
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,В наявності
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,відкриті питання
@@ -1108,7 +1108,7 @@
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,Центр витрат продажу за замовчуванням
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,ЗІП код
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Поштовий індекс
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Замовлення клієнта {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Створення Руху ТМЦ
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 55b0999..0905397 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -106,7 +106,7 @@
 DocType: BOM,Operations,Tác vụ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Không thể thiết lập ủy quyền trên cơ sở giảm giá cho {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Đính kèm tập tin .csv với hai cột, một cho tên tuổi và một cho tên mới"
-apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} không trong bất kỳ năm tài chính hoạt động.
+apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} không trong bất kỳ năm tài chính đang hoạt động.
 DocType: Packed Item,Parent Detail docname,Cha mẹ chi tiết docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tham khảo: {0}, Mã hàng: {1} và Khách hàng: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
@@ -231,7 +231,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Thực hiện
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
 DocType: Serial No,Maintenance Status,Tình trạng bảo trì
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Nhà cung cấp là cần thiết cho đối với Khoản phải trả {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Cần nhập Nhà cung cấp là đối với Khoản phải trả {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Hàng hóa và giá cả
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Tổng số giờ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Từ ngày phải được trong năm tài chính. Giả sử Từ ngày = {0}
@@ -1072,7 +1072,7 @@
 DocType: Delivery Note,Delivery To,Để giao hàng
 apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Chọn đơn đặt hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} không thể bị âm
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} không được phép âm
 apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Giảm giá
 DocType: Asset,Total Number of Depreciations,Tổng Số khấu hao
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ Giãn
@@ -1461,7 +1461,7 @@
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rule thuế cho các giao dịch.
 DocType: Rename Tool,Type of document to rename.,Loại tài liệu để đổi tên.
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Chúng tôi mua vật tư HH này
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Khách hàng là cần thiết đối với Khoản phải thu {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Cần nhập Khách hàng đối với Khoản phải thu {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Tổng số thuế và lệ phí (Công ty tiền tệ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Hiện P &amp; L số dư năm tài chính không khép kín
 DocType: Shipping Rule,Shipping Account,Tài khoản vận chuyển
@@ -1572,7 +1572,7 @@
 ,POS,POS
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Số dư tồn kho đầu kỳ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} phải chỉ xuất hiện một lần
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} phải xuất hiện một lần
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để tuyền hơn {0} {1} hơn so với mua hàng {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lá được phân bổ thành công cho {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Không có mục để đóng gói
@@ -1717,7 +1717,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Trung tâm Chi phí là cần thiết đối với tài khoản 'Lãi và Lỗ' {2}. Vui lòng thiết lập một Trung tâm Chi phí mặc định cho Công ty.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Trung tâm Chi phí là yêu cầu bắt buộc đối với tài khoản 'Lãi và Lỗ' {2}. Vui lòng thiết lập một Trung tâm Chi phí mặc định cho Công ty.
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng cùng tên đã tồn tại. Hãy thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Liên hệ Mới
 DocType: Territory,Parent Territory,địa bàn cấp trên
@@ -2110,7 +2110,7 @@
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
 DocType: Grading Scale,Grading Scale Intervals,Khoảng phân loại Scale
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bút Toán cho {2} chỉ có thể được tạo với tiền tệ: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bút Toán cho {2} chỉ có thể được tạo với loại tiền tệ: {3}
 DocType: Production Order,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Itemwise Giảm giá
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Cây tài khoản tài chính.
@@ -2332,7 +2332,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} chưa được đệ trình
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Yêu cầu cho các hạng mục.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Để sản xuất riêng biệt sẽ được tạo ra cho mỗi mục tốt đã hoàn thành.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} phải được tiêu cực trong tài liệu trở lại
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} phải được tiêu cực trong tài liệu trả về
 ,Minutes to First Response for Issues,Phút để đáp ứng đầu tiên cho vấn đề
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Tên của viện mà bạn đang thiết lập hệ thống này.
@@ -2363,7 +2363,7 @@
 DocType: Student,Joining Date,Tham gia ngày
 ,Employees working on a holiday,Nhân viên làm việc trên một kỳ nghỉ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Đánh dấu hiện tại
-DocType: Project,% Complete Method,Phương pháp% Hoàn thành
+DocType: Project,% Complete Method,% Phương pháp Hoàn thành
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
 DocType: Production Order,Actual End Date,Ngày kết thúc thực tế
 DocType: BOM,Operating Cost (Company Currency),Chi phí điều hành (Công ty ngoại tệ)
@@ -2543,7 +2543,7 @@
 DocType: Company,Stock Settings,Thiết lập thông số hàng tồn kho
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
 DocType: Vehicle,Electric,Điện
-DocType: Task,% Progress,% Tiến bộ
+DocType: Task,% Progress,% Tiến triển
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Lãi / lỗ trên rác Asset
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Sẽ gửi một email về các sự kiện để nhân viên có tư cách &#39;mở&#39;
 DocType: Task,Depends on Tasks,Phụ thuộc vào nhiệm vụ
@@ -3522,7 +3522,7 @@
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Mua Thuế và phí Template
 DocType: Upload Attendance,Download Template,Tải mẫu
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Hoặc là ghi nợ hoặc số tiền tín dụng là cần thiết cho {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ghi nợ hoặc Tín dụng là yêu cầu bắt buộc với {2}
 DocType: GL Entry,Remarks,Ghi chú
 DocType: Payment Entry,Account Paid From,Tài khoản Trích nợ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nguyên liệu Item Code
@@ -3956,7 +3956,7 @@
 apps/erpnext/erpnext/config/support.py +22,Warranty,Bảo hành
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Ban hành
 DocType: Production Order,Warehouses,Kho
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tài sản không thể được chuyển giao
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tài sản không thể chuyển giao
 apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Mục này là một biến thể của {0} (Bản mẫu).
 DocType: Workstation,per hour,mỗi giờ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Thu mua