Merge branch 'develop' of https://github.com/frappe/erpnext into develop

.github/ISSUE_TEMPLATE/question-about-using-erpnext.md

@@ -8,7 +8,7 @@ Please post on our forums:
 
 for questions about using `ERPNext`: https://discuss.erpnext.com
 
-for questions about using the `Frappe Framework`: https://discuss.frappe.io
+for questions about using the `Frappe Framework`: ~~https://discuss.frappe.io~~ => [stackoverflow](https://stackoverflow.com/questions/tagged/frappe) tagged under `frappe`
 
 for questions about using `bench`, probably the best place to start is the [bench repo](https://github.com/frappe/bench)
 

erpnext/accounts/doctype/account/account.py

@@ -95,29 +95,29 @@ class Account(NestedSet):
 		# ignore validation while creating new compnay or while syncing to child companies
 		if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
 			return
-
 		ancestors = get_root_company(self.company)
 		if ancestors:
 			if frappe.get_value("Company", self.company, "allow_account_creation_against_child_company"):
 				return
-
 			if not frappe.db.get_value("Account",
 				{'account_name': self.account_name, 'company': ancestors[0]}, 'name'):
 				frappe.throw(_("Please add the account to root level Company - %s" % ancestors[0]))
 		else:
 			descendants = get_descendants_of('Company', self.company)
 			if not descendants: return
-
 			parent_acc_name_map = {}
 			parent_acc_name, parent_acc_number = frappe.db.get_value('Account', self.parent_account, \
 				["account_name", "account_number"])
-			for d in frappe.db.get_values('Account',
-				{ "company": ["in", descendants], "account_name": parent_acc_name, 
-					"account_number": parent_acc_number },
-				["company", "name"], as_dict=True):
+			filters = { 
+				"company": ["in", descendants],
+				"account_name": parent_acc_name, 
+			}
+			if parent_acc_number:
+				filters["account_number"] = parent_acc_number
+
+			for d in frappe.db.get_values('Account', filters=filters, fieldname=["company", "name"], as_dict=True):
 				parent_acc_name_map[d["company"]] = d["name"]
 			if not parent_acc_name_map: return
-
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
 	def validate_group_or_ledger(self):
@@ -175,7 +175,6 @@ class Account(NestedSet):
 				filters["account_number"] = self.account_number
 
 			child_account = frappe.db.get_value("Account", filters, 'name')
-
 			if not child_account:
 				doc = frappe.copy_doc(self)
 				doc.flags.ignore_root_company_validation = True

erpnext/accounts/doctype/budget/budget.py

@@ -210,10 +210,10 @@ def get_requested_amount(args, budget):
 	item_code = args.get('item_code')
 	condition = get_other_condition(args, budget, 'Material Request')
 
-	data = frappe.db.sql(""" select ifnull((sum(mri.stock_qty - mri.ordered_qty) * rate), 0) as amount
-		from `tabMaterial Request Item` mri, `tabMaterial Request` mr where mr.name = mri.parent and
-		mri.item_code = %s and mr.docstatus = 1 and mri.stock_qty > mri.ordered_qty and {0} and
-		mr.material_request_type = 'Purchase' and mr.status != 'Stopped'""".format(condition), item_code, as_list=1)
+	data = frappe.db.sql(""" select ifnull((sum(child.stock_qty - child.ordered_qty) * rate), 0) as amount
+		from `tabMaterial Request Item` child, `tabMaterial Request` parent where parent.name = child.parent and
+		child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {0} and
+		parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(condition), item_code, as_list=1)
 
 	return data[0][0] if data else 0
 
@@ -221,10 +221,10 @@ def get_ordered_amount(args, budget):
 	item_code = args.get('item_code')
 	condition = get_other_condition(args, budget, 'Purchase Order')
 
-	data = frappe.db.sql(""" select ifnull(sum(poi.amount - poi.billed_amt), 0) as amount
-		from `tabPurchase Order Item` poi, `tabPurchase Order` po where
-		po.name = poi.parent and poi.item_code = %s and po.docstatus = 1 and poi.amount > poi.billed_amt
-		and po.status != 'Closed' and {0}""".format(condition), item_code, as_list=1)
+	data = frappe.db.sql(""" select ifnull(sum(child.amount - child.billed_amt), 0) as amount
+		from `tabPurchase Order Item` child, `tabPurchase Order` parent where
+		parent.name = child.parent and child.item_code = %s and parent.docstatus = 1 and child.amount > child.billed_amt
+		and parent.status != 'Closed' and {0}""".format(condition), item_code, as_list=1)
 
 	return data[0][0] if data else 0
 
@@ -233,16 +233,15 @@ def get_other_condition(args, budget, for_doc):
 	budget_against_field = frappe.scrub(args.get("budget_against_field"))
 
 	if budget_against_field and args.get(budget_against_field):
-		condition += " and %s = '%s'" %(budget_against_field, args.get(budget_against_field))
+		condition += " and child.%s = '%s'" %(budget_against_field, args.get(budget_against_field))
 
 	if args.get('fiscal_year'):
 		date_field = 'schedule_date' if for_doc == 'Material Request' else 'transaction_date'
 		start_date, end_date = frappe.db.get_value('Fiscal Year', args.get('fiscal_year'),
 			['year_start_date', 'year_end_date'])
 
-		alias = 'mr' if for_doc == 'Material Request' else 'po'
-		condition += """ and %s.%s
-			between '%s' and '%s' """ %(alias, date_field, start_date, end_date)
+		condition += """ and parent.%s
+			between '%s' and '%s' """ %(date_field, start_date, end_date)
 
 	return condition
 

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -96,7 +96,11 @@ def build_forest(data):
 			if parent_account == account_name == child:
 				return [parent_account]
 			elif account_name == child:
-				return [child] + return_parent(data, parent_account)
+				parent_account_list = return_parent(data, parent_account)
+				if not parent_account_list:
+					frappe.throw(_("The parent account {0} does not exists")
+						.format(parent_account))
+				return [child] + parent_account_list
 
 	charts_map, paths = {}, []
 

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -866,6 +866,7 @@ class PurchaseInvoice(BuyingController):
 		# because updating ordered qty in bin depends upon updated ordered qty in PO
 		if self.update_stock == 1:
 			self.update_stock_ledger()
+			self.delete_auto_created_batches()
 
 		self.make_gl_entries_on_cancel()
 		self.update_project()

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -1238,24 +1238,27 @@ class SalesInvoice(SellingController):
 				self.status = 'Draft'
 			return
 
+		precision = self.precision("outstanding_amount")
+		outstanding_amount = flt(self.outstanding_amount, precision)
+
 		if not status:
 			if self.docstatus == 2:
 				status = "Cancelled"
 			elif self.docstatus == 1:
-				if flt(self.outstanding_amount) > 0 and getdate(self.due_date) < getdate(nowdate()) and self.is_discounted and self.get_discounting_status()=='Disbursed':
+				if outstanding_amount > 0 and getdate(self.due_date) < getdate(nowdate()) and self.is_discounted and self.get_discounting_status()=='Disbursed':
 					self.status = "Overdue and Discounted"
-				elif flt(self.outstanding_amount) > 0 and getdate(self.due_date) < getdate(nowdate()):
+				elif outstanding_amount > 0 and getdate(self.due_date) < getdate(nowdate()):
 					self.status = "Overdue"
-				elif flt(self.outstanding_amount) > 0 and getdate(self.due_date) >= getdate(nowdate()) and self.is_discounted and self.get_discounting_status()=='Disbursed':
+				elif outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()) and self.is_discounted and self.get_discounting_status()=='Disbursed':
 					self.status = "Unpaid and Discounted"
-				elif flt(self.outstanding_amount) > 0 and getdate(self.due_date) >= getdate(nowdate()):
+				elif outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()):
 					self.status = "Unpaid"
 				#Check if outstanding amount is 0 due to credit note issued against invoice
-				elif flt(self.outstanding_amount) <= 0 and self.is_return == 0 and frappe.db.get_value('Sales Invoice', {'is_return': 1, 'return_against': self.name, 'docstatus': 1}):
+				elif outstanding_amount <= 0 and self.is_return == 0 and frappe.db.get_value('Sales Invoice', {'is_return': 1, 'return_against': self.name, 'docstatus': 1}):
 					self.status = "Credit Note Issued"
 				elif self.is_return == 1:
 					self.status = "Return"
-				elif flt(self.outstanding_amount)<=0:
+				elif outstanding_amount <=0:
 					self.status = "Paid"
 				else:
 					self.status = "Submitted"

erpnext/accounts/doctype/subscription/subscription.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "ACC-SUB-.YYYY.-.#####",
  "creation": "2017-07-18 17:50:43.967266",
  "doctype": "DocType",
@@ -155,7 +156,7 @@
    "fieldname": "apply_additional_discount",
    "fieldtype": "Select",
    "label": "Apply Additional Discount On",
-   "options": "\nGrand Total\nNet total"
+   "options": "\nGrand Total\nNet Total"
   },
   {
    "fieldname": "cb_2",
@@ -196,7 +197,8 @@
    "fieldtype": "Column Break"
   }
  ],
- "modified": "2019-07-25 18:45:38.579579",
+ "links": [],
+ "modified": "2020-01-27 14:37:32.845173",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription",

erpnext/accounts/doctype/subscription/subscription.py

@@ -280,7 +280,7 @@ class Subscription(Document):
 
 		if self.additional_discount_percentage or self.additional_discount_amount:
 			discount_on = self.apply_additional_discount
-			invoice.apply_additional_discount = discount_on if discount_on else 'Grand Total'
+			invoice.apply_discount_on = discount_on if discount_on else 'Grand Total'
 
 		# Subscription period
 		invoice.from_date = self.current_invoice_start

erpnext/accounts/report/balance_sheet/balance_sheet.js

@@ -14,6 +14,7 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 	frappe.query_reports["Balance Sheet"]["filters"].push({
 		"fieldname": "include_default_book_entries",
 		"label": __("Include Default Book Entries"),
-		"fieldtype": "Check"
+		"fieldtype": "Check",
+		"default": 1
 	});
 });

erpnext/accounts/report/cash_flow/cash_flow.js

@@ -20,7 +20,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 		{
 			"fieldname": "include_default_book_entries",
 			"label": __("Include Default Book Entries"),
-			"fieldtype": "Check"
+			"fieldtype": "Check",
+			"default": 1
 		}
 	);
 });

erpnext/accounts/report/cash_flow/cash_flow.py

@@ -130,11 +130,11 @@ def get_account_type_based_gl_data(company, start_date, end_date, account_type,
 	filters = frappe._dict(filters)
 
 	if filters.finance_book:
-		cond = " and finance_book = %s" %(frappe.db.escape(filters.finance_book))
+		cond = " AND (finance_book in (%s, '') OR finance_book IS NULL)" %(frappe.db.escape(filters.finance_book))
 		if filters.include_default_book_entries:
 			company_fb = frappe.db.get_value("Company", company, 'default_finance_book')
 
-			cond = """ and finance_book in (%s, %s)
+			cond = """ AND (finance_book in (%s, %s, '') OR finance_book IS NULL)
 				""" %(frappe.db.escape(filters.finance_book), frappe.db.escape(company_fb))
 
 	gl_sum = frappe.db.sql_list("""

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js

@@ -58,7 +58,8 @@ frappe.query_reports["Consolidated Financial Statement"] = {
 		{
 			"fieldname": "include_default_book_entries",
 			"label": __("Include Default Book Entries"),
-			"fieldtype": "Check"
+			"fieldtype": "Check",
+			"default": 1
 		}
 	]
 }

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

@@ -389,9 +389,9 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 
 	if filters.get("finance_book"):
 		if filters.get("include_default_book_entries"):
-			additional_conditions.append("finance_book in (%(finance_book)s, %(company_fb)s)")
+			additional_conditions.append("(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)")
 		else:
-			additional_conditions.append("finance_book in (%(finance_book)s)")
+			additional_conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/financial_statements.py

@@ -408,9 +408,9 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 
 		if filters.get("finance_book"):
 			if filters.get("include_default_book_entries"):
-				additional_conditions.append("finance_book in (%(finance_book)s, %(company_fb)s)")
+				additional_conditions.append("(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)")
 			else:
-				additional_conditions.append("finance_book in (%(finance_book)s)")
+				additional_conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -154,7 +154,8 @@ frappe.query_reports["General Ledger"] = {
 		{
 			"fieldname": "include_default_book_entries",
 			"label": __("Include Default Book Entries"),
-			"fieldtype": "Check"
+			"fieldtype": "Check",
+			"default": 1
 		}
 	]
 }

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -119,7 +119,7 @@ def get_gl_entries(filters):
 	select_fields = """, debit, credit, debit_in_account_currency,
 		credit_in_account_currency """
 
-	order_by_statement = "order by posting_date, account"
+	order_by_statement = "order by posting_date, account, creation"
 
 	if filters.get("group_by") == _("Group by Voucher"):
 		order_by_statement = "order by posting_date, voucher_type, voucher_no"
@@ -184,7 +184,7 @@ def get_conditions(filters):
 
 	if filters.get("finance_book"):
 		if filters.get("include_default_book_entries"):
-			conditions.append("finance_book in (%(finance_book)s, %(company_fb)s)")
+			conditions.append("(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)")
 		else:
 			conditions.append("finance_book in (%(finance_book)s)")
 

erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js

@@ -23,7 +23,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 		{
 			"fieldname": "include_default_book_entries",
 			"label": __("Include Default Book Entries"),
-			"fieldtype": "Check"
+			"fieldtype": "Check",
+			"default": 1
 		}
 	);
 });

erpnext/accounts/report/trial_balance/trial_balance.js

@@ -85,7 +85,8 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
 			{
 				"fieldname": "include_default_book_entries",
 				"label": __("Include Default Book Entries"),
-				"fieldtype": "Check"
+				"fieldtype": "Check",
+				"default": 1
 			}
 		],
 		"formatter": erpnext.financial_statements.formatter,

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -103,9 +103,9 @@ def get_rootwise_opening_balances(filters, report_type):
 			where lft >= %s and rgt <= %s)""" % (lft, rgt)
 
 	if filters.finance_book:
-		fb_conditions = " and finance_book = %(finance_book)s"
+		fb_conditions = " AND finance_book = %(finance_book)s"
 		if filters.include_default_book_entries:
-			fb_conditions = " and (finance_book in (%(finance_book)s, %(company_fb)s))"
+			fb_conditions = " AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
 
 		additional_conditions += fb_conditions
 

erpnext/accounts/utils.py

@@ -640,8 +640,9 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
 
 	if account:
-		root_type = frappe.get_cached_value("Account", account, "root_type")
+		root_type, account_type = frappe.get_cached_value("Account", account, ["root_type", "account_type"])
 		party_account_type = "Receivable" if root_type == "Asset" else "Payable"
+		party_account_type = account_type or party_account_type
 	else:
 		party_account_type = erpnext.get_party_account_type(party_type)
 

erpnext/assets/doctype/asset/asset.py

@@ -620,7 +620,7 @@ def get_asset_account(account_name, asset=None, asset_category=None, company=Non
 
 	if not account:
 		if not asset_category:
-			frappe.throw(_("Set {0} in company {2}").format(account_name.replace('_', ' ').title(), company))
+			frappe.throw(_("Set {0} in company {1}").format(account_name.replace('_', ' ').title(), company))
 		else:
 			frappe.throw(_("Set {0} in asset category {1} or company {2}")
 				.format(account_name.replace('_', ' ').title(), asset_category, company))

erpnext/assets/report/fixed_asset_register/fixed_asset_register.js

@@ -20,6 +20,16 @@ frappe.query_reports["Fixed Asset Register"] = {
 			default: 'In Location',
 			reqd: 1
 		},
+		{
+			fieldname:"purchase_date",
+			label: __("Purchase Date"),
+			fieldtype: "Date"
+		},
+		{
+			fieldname:"available_for_use_date",
+			label: __("Available For Use Date"),
+			fieldtype: "Date"
+		},
 		{
 			fieldname:"finance_book",
 			label: __("Finance Book"),
@@ -27,10 +37,15 @@ frappe.query_reports["Fixed Asset Register"] = {
 			options: "Finance Book"
 		},
 		{
-			fieldname:"date",
-			label: __("Date"),
-			fieldtype: "Date",
-			default: frappe.datetime.get_today()
+			fieldname:"asset_category",
+			label: __("Asset Category"),
+			fieldtype: "Link",
+			options: "Asset Category"
+		},
+		{
+			fieldname:"is_existing_asset",
+			label: __("Is Existing Asset"),
+			fieldtype: "Check"
 		},
 	]
 };

erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

@@ -40,6 +40,42 @@ def get_columns(filters):
 			"fieldname": "status",
 			"width": 90
 		},
+		{
+			"label": _("Purchase Date"),
+			"fieldtype": "Date",
+			"fieldname": "purchase_date",
+			"width": 90
+		},
+		{
+			"label": _("Available For Use Date"),
+			"fieldtype": "Date",
+			"fieldname": "available_for_use_date",
+			"width": 90
+		},
+		{
+			"label": _("Gross Purchase Amount"),
+			"fieldname": "gross_purchase_amount",
+			"options": "Currency",
+			"width": 90
+		},
+		{
+			"label": _("Asset Value"),
+			"fieldname": "asset_value",
+			"options": "Currency",
+			"width": 90
+		},
+		{
+			"label": _("Opening Accumulated Depreciation"),
+			"fieldname": "opening_accumulated_depreciation",
+			"options": "Currency",
+			"width": 90
+		},
+		{
+			"label": _("Depreciated Amount"),
+			"fieldname": "depreciated_amount",
+			"options": "Currency",
+			"width": 90
+		},
 		{
 			"label": _("Cost Center"),
 			"fieldtype": "Link",
@@ -54,25 +90,6 @@ def get_columns(filters):
 			"options": "Department",
 			"width": 100
 		},
-		{
-			"label": _("Location"),
-			"fieldtype": "Link",
-			"fieldname": "location",
-			"options": "Location",
-			"width": 100
-		},
-		{
-			"label": _("Purchase Date"),
-			"fieldtype": "Date",
-			"fieldname": "purchase_date",
-			"width": 90
-		},
-		{
-			"label": _("Gross Purchase Amount"),
-			"fieldname": "gross_purchase_amount",
-			"options": "Currency",
-			"width": 90
-		},
 		{
 			"label": _("Vendor Name"),
 			"fieldtype": "Data",
@@ -80,25 +97,29 @@ def get_columns(filters):
 			"width": 100
 		},
 		{
-			"label": _("Available For Use Date"),
-			"fieldtype": "Date",
-			"fieldname": "available_for_use_date",
-			"width": 90
-		},
-		{
-			"label": _("Asset Value"),
-			"fieldname": "asset_value",
-			"options": "Currency",
-			"width": 90
+			"label": _("Location"),
+			"fieldtype": "Link",
+			"fieldname": "location",
+			"options": "Location",
+			"width": 100
 		},
 	]
 
 def get_conditions(filters):
-	conditions = {'docstatus': 1}
+	conditions = { 'docstatus': 1 }
 	status = filters.status
+	date = filters.date
 
-	if filters.company:
+	if filters.get('company'):
 		conditions["company"] = filters.company
+	if filters.get('purchase_date'):
+		conditions["purchase_date"] = ('<=', filters.get('purchase_date'))
+	if filters.get('available_for_use_date'):
+		conditions["available_for_use_date"] = ('<=', filters.get('available_for_use_date'))
+	if filters.get('is_existing_asset'):
+		conditions["is_existing_asset"] = filters.get('is_existing_asset')
+	if filters.get('asset_category'):
+		conditions["asset_category"] = filters.get('asset_category')
 
 	# In Store assets are those that are not sold or scrapped
 	operand = 'not in'
@@ -114,7 +135,7 @@ def get_data(filters):
 	data = []
 
 	conditions = get_conditions(filters)
-	depreciation_amount_map = get_finance_book_value_map(filters.date, filters.finance_book)
+	depreciation_amount_map = get_finance_book_value_map(filters)
 	pr_supplier_map = get_purchase_receipt_supplier_map()
 	pi_supplier_map = get_purchase_invoice_supplier_map()
 
@@ -136,6 +157,8 @@ def get_data(filters):
 				"cost_center": asset.cost_center,
 				"vendor_name": pr_supplier_map.get(asset.purchase_receipt) or pi_supplier_map.get(asset.purchase_invoice),
 				"gross_purchase_amount": asset.gross_purchase_amount,
+				"opening_accumulated_depreciation": asset.opening_accumulated_depreciation,
+				"depreciated_amount": depreciation_amount_map.get(asset.name) or 0.0,
 				"available_for_use_date": asset.available_for_use_date,
 				"location": asset.location,
 				"asset_category": asset.asset_category,
@@ -146,9 +169,9 @@ def get_data(filters):
 
 	return data
 
-def get_finance_book_value_map(date, finance_book=''):
-	if not date:
-		date = today()
+def get_finance_book_value_map(filters):
+	date = filters.get('purchase_date') or filters.get('available_for_use_date') or today()
+
 	return frappe._dict(frappe.db.sql(''' Select
 		parent, SUM(depreciation_amount)
 		FROM `tabDepreciation Schedule`
@@ -157,7 +180,7 @@ def get_finance_book_value_map(date, finance_book=''):
 			AND schedule_date<=%s
 			AND journal_entry IS NOT NULL
 			AND ifnull(finance_book, '')=%s
-		GROUP BY parent''', (date, cstr(finance_book))))
+		GROUP BY parent''', (date, cstr(filters.finance_book or ''))))
 
 def get_purchase_receipt_supplier_map():
 	return frappe._dict(frappe.db.sql(''' Select

erpnext/controllers/stock_controller.py

@@ -234,6 +234,17 @@ class StockController(AccountsController):
 				frappe.throw(_("{0} {1}: Cost Center is mandatory for Item {2}").format(
 					_(self.doctype), self.name, item.get("item_code")))
 
+	def delete_auto_created_batches(self):
+		for d in self.items:
+			if not d.batch_no: continue
+
+			d.batch_no = None
+			d.db_set("batch_no", None)
+
+		for data in frappe.get_all("Batch",
+			{'reference_name': self.name, 'reference_doctype': self.doctype}):
+			frappe.delete_doc("Batch", data.name)
+
 	def get_sl_entries(self, d, args):
 		sl_dict = frappe._dict({
 			"item_code": d.get("item_code", None),

erpnext/crm/doctype/lead/lead.py

@@ -62,7 +62,8 @@ class Lead(SellingController):
 		if self.contact_date and getdate(self.contact_date) < getdate(nowdate()):
 			frappe.throw(_("Next Contact Date cannot be in the past"))
 
-		if self.ends_on and self.contact_date and (self.ends_on < self.contact_date):
+		if (self.ends_on and self.contact_date and
+			(getdate(self.ends_on) < getdate(self.contact_date))):
 			frappe.throw(_("Ends On date cannot be before Next Contact Date."))
 
 	def on_update(self):

erpnext/crm/report/lead_details/lead_details.json

@@ -1,28 +1,29 @@
 {
- "add_total_row": 0, 
- "creation": "2013-10-22 11:58:16", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 3, 
- "is_standard": "Yes", 
- "modified": "2018-09-26 18:59:46.520731", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Lead Details", 
- "owner": "Administrator", 
- "prepared_report": 0, 
- "query": "SELECT\n    `tabLead`.name as \"Lead Id:Link/Lead:120\",\n    `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n\t`tabLead`.notes as \"Notes::360\",\n    `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabDynamic Link` on (\n\t\t`tabDynamic Link`.link_name=`tabLead`.name\n\t)\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.name=`tabDynamic Link`.parent\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", 
- "ref_doctype": "Lead", 
- "report_name": "Lead Details", 
- "report_type": "Query Report", 
+ "add_total_row": 0,
+ "creation": "2013-10-22 11:58:16",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 3,
+ "is_standard": "Yes",
+ "modified": "2020-01-22 16:51:56.591110",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Lead Details",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "query": "SELECT\n    `tabLead`.name as \"Lead Id:Link/Lead:120\",\n    `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n\t`tabLead`.notes as \"Notes::360\",\n    `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabDynamic Link` on (\n\t\t`tabDynamic Link`.link_name=`tabLead`.name \n\t\tand `tabDynamic Link`.parenttype = 'Address'\n\t)\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.name=`tabDynamic Link`.parent\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc",
+ "ref_doctype": "Lead",
+ "report_name": "Lead Details",
+ "report_type": "Query Report",
  "roles": [
   {
    "role": "Sales User"
-  }, 
+  },
   {
    "role": "Sales Manager"
-  }, 
+  },
   {
    "role": "System Manager"
   }

erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py

@@ -53,7 +53,11 @@ def add_institution(token, response):
 
 @frappe.whitelist()
 def add_bank_accounts(response, bank, company):
-	response = json.loads(response) if not "accounts" in response else response
+	try:
+		response = json.loads(response)
+	except TypeError:
+		pass
+
 	bank = json.loads(bank)
 	result = []
 

erpnext/healthcare/doctype/lab_test_template/lab_test_template.js

@@ -3,17 +3,17 @@
 
 frappe.ui.form.on("Lab Test Template",{
 	lab_test_name: function(frm) {
-		if(!frm.doc.lab_test_code)
+		if (!frm.doc.lab_test_code)
 			frm.set_value("lab_test_code", frm.doc.lab_test_name);
-		if(!frm.doc.lab_test_description)
+		if (!frm.doc.lab_test_description)
 			frm.set_value("lab_test_description", frm.doc.lab_test_name);
 	},
-	refresh :  function(frm){
+	refresh : function(frm) {
 		// Restrict Special, Grouped type templates in Child TestGroups
 		frm.set_query("lab_test_template", "lab_test_groups", function() {
 			return {
 				filters: {
-					lab_test_template_type:['in',['Single','Compound']]
+					lab_test_template_type: ['in',['Single','Compound']]
 				}
 			};
 		});
@@ -23,83 +23,44 @@ frappe.ui.form.on("Lab Test Template",{
 cur_frm.cscript.custom_refresh = function(doc) {
 	cur_frm.set_df_property("lab_test_code", "read_only", doc.__islocal ? 0 : 1);
 
-	if(!doc.__islocal) {
-		cur_frm.add_custom_button(__('Change Template Code'), function() {
-			change_template_code(cur_frm,doc);
-		} );
-		if(doc.disabled == 1){
-			cur_frm.add_custom_button(__('Enable Template'), function() {
-				enable_template(cur_frm);
-			} );
-		}
-		else{
-			cur_frm.add_custom_button(__('Disable Template'), function() {
-				disable_template(cur_frm);
-			} );
-		}
+	if (!doc.__islocal) {
+		cur_frm.add_custom_button(__("Change Template Code"), function() {
+			change_template_code(doc);
+		});
 	}
 };
 
-var disable_template = function(frm){
-	var doc = frm.doc;
-	frappe.call({
-		method: 		"erpnext.healthcare.doctype.lab_test_template.lab_test_template.disable_enable_test_template",
-		args: {status: 1, name: doc.name, is_billable: doc.is_billable},
-		callback: function(){
-			cur_frm.reload_doc();
-		}
-	});
-};
-
-var enable_template = function(frm){
-	var doc = frm.doc;
-	frappe.call({
-		method: 		"erpnext.healthcare.doctype.lab_test_template.lab_test_template.disable_enable_test_template",
-		args: {status: 0, name: doc.name, is_billable: doc.is_billable},
-		callback: function(){
-			cur_frm.reload_doc();
-		}
-	});
-};
-
-
-var change_template_code = function(frm,doc){
-	var d = new frappe.ui.Dialog({
+let change_template_code = function(doc) {
+	let d = new frappe.ui.Dialog({
 		title:__("Change Template Code"),
 		fields:[
 			{
 				"fieldtype": "Data",
-				"label": "Test Template Code",
-				"fieldname": "Test Code",
-				reqd:1
-			},
-			{
-				"fieldtype": "Button",
-				"label": __("Change Code"),
-				click: function() {
-					var values = d.get_values();
-					if(!values)
-						return;
-					change_test_code_from_template(values["Test Code"],doc);
-					d.hide();
-				}
+				"label": "Lab Test Template Code",
+				"fieldname": "lab_test_code",
+				reqd: 1
 			}
-		]
+		],
+		primary_action: function() {
+			let values = d.get_values();
+			if (values) {
+				frappe.call({
+					"method": "erpnext.healthcare.doctype.lab_test_template.lab_test_template.change_test_code_from_template",
+					"args": {lab_test_code: values.lab_test_code, doc: doc},
+					callback: function (data) {
+						frappe.set_route("Form", "Lab Test Template", data.message);
+					}
+				});
+			}
+			d.hide();
+		},
+		primary_action_label: __("Change Template Code")
 	});
 	d.show();
-	d.set_values({
-		'Test Code': doc.lab_test_code
-	});
 
-	var change_test_code_from_template = function(lab_test_code,doc){
-		frappe.call({
-			"method": "erpnext.healthcare.doctype.lab_test_template.lab_test_template.change_test_code_from_template",
-			"args": {lab_test_code: lab_test_code, doc: doc},
-			callback: function (data) {
-				frappe.set_route("Form", "Lab Test Template", data.message);
-			}
-		});
-	};
+	d.set_values({
+		"lab_test_code": doc.lab_test_code
+	});
 };
 
 frappe.ui.form.on("Lab Test Template", "lab_test_name", function(frm){
@@ -124,8 +85,8 @@ frappe.ui.form.on("Lab Test Template", "lab_test_description", function(frm){
 });
 
 frappe.ui.form.on("Lab Test Groups", "template_or_new_line", function (frm, cdt, cdn) {
-	var child = locals[cdt][cdn];
-	if(child.template_or_new_line =="Add new line"){
+	let child = locals[cdt][cdn];
+	if (child.template_or_new_line == "Add new line") {
 		frappe.model.set_value(cdt, cdn, 'lab_test_template', "");
 		frappe.model.set_value(cdt, cdn, 'lab_test_description', "");
 	}

erpnext/healthcare/doctype/lab_test_template/lab_test_template.py

@@ -9,59 +9,76 @@ from frappe.model.rename_doc import rename_doc
 from frappe import _
 
 class LabTestTemplate(Document):
+	def after_insert(self):
+		if not self.item:
+			create_item_from_template(self)
+
+	def validate(self):
+		self.enable_disable_item()
+
 	def on_update(self):
-		#Item and Price List update --> if (change_in_item)
-		if(self.change_in_item and self.is_billable == 1 and self.item):
-			updating_item(self)
-			item_price = item_price_exist(self)
+		# if change_in_item update Item and Price List
+		if self.change_in_item and self.is_billable and self.item:
+			self.update_item()
+			item_price = self.item_price_exists()
 			if not item_price:
-				if(self.lab_test_rate != 0.0):
+				if self.lab_test_rate != 0.0:
 					price_list_name = frappe.db.get_value("Price List", {"selling": 1})
-					if(self.lab_test_rate):
+					if self.lab_test_rate:
 						make_item_price(self.lab_test_code, price_list_name, self.lab_test_rate)
 					else:
 						make_item_price(self.lab_test_code, price_list_name, 0.0)
 			else:
 				frappe.db.set_value("Item Price", item_price, "price_list_rate", self.lab_test_rate)
 
-			frappe.db.set_value(self.doctype,self.name,"change_in_item",0)
-		elif(self.is_billable == 0 and self.item):
-			frappe.db.set_value("Item",self.item,"disabled",1)
+			frappe.db.set_value(self.doctype, self.name, "change_in_item", 0)
+
+		elif not self.is_billable and self.item:
+			frappe.db.set_value("Item", self.item, "disabled", 1)
+
 		self.reload()
 
-	def after_insert(self):
-		if not self.item:
-			create_item_from_template(self)
-
-	#Call before delete the template
 	def on_trash(self):
-		# remove template refernce from item and disable item
-		if(self.item):
+		# remove template reference from item and disable item
+		if self.item:
 			try:
-				frappe.delete_doc("Item",self.item, force=True)
+				frappe.delete_doc("Item", self.item)
 			except Exception:
-				frappe.throw(_("""Not permitted. Please disable the Test Template"""))
+				frappe.throw(_("Not permitted. Please disable the Lab Test Template"))
 
-def item_price_exist(doc):
-	item_price = frappe.db.exists({
-	"doctype": "Item Price",
-	"item_code": doc.lab_test_code})
-	if(item_price):
-		return item_price[0][0]
-	else:
-		return False
+	def enable_disable_item(self):
+		if self.is_billable:
+			if self.disabled:
+				frappe.db.set_value('Item', self.item, 'disabled', 1)
+			else:
+				frappe.db.set_value('Item', self.item, 'disabled', 0)
+
+	def update_item(self):
+		item = frappe.get_doc("Item", self.item)
+		if item:
+			item.update({
+				"item_name": self.lab_test_name,
+				"item_group": self.lab_test_group,
+				"disabled": 0,
+				"standard_rate": self.lab_test_rate,
+				"description": self.lab_test_description
+			})
+			item.save()
+
+	def item_price_exists(self):
+		item_price = frappe.db.exists({"doctype": "Item Price", "item_code": self.lab_test_code})
+		if item_price:
+			return item_price[0][0]
+		else:
+			return False
 
-def updating_item(self):
-	frappe.db.sql("""update `tabItem` set item_name=%s, item_group=%s, disabled=0, standard_rate=%s,
-		description=%s, modified=NOW() where item_code=%s""",
-		(self.lab_test_name, self.lab_test_group , self.lab_test_rate, self.lab_test_description, self.item))
 
 def create_item_from_template(doc):
-	if(doc.is_billable == 1):
+	if doc.is_billable:
 		disabled = 0
 	else:
 		disabled = 1
-	#insert item
+	# insert item
 	item =  frappe.get_doc({
 	"doctype": "Item",
 	"item_code": doc.lab_test_code,
@@ -78,9 +95,9 @@ def create_item_from_template(doc):
 	"stock_uom": "Unit"
 	}).insert(ignore_permissions=True)
 
-	#insert item price
-	#get item price list to insert item price
-	if(doc.lab_test_rate != 0.0):
+	# insert item price
+	# get item price list to insert item price
+	if doc.lab_test_rate != 0.0:
 		price_list_name = frappe.db.get_value("Price List", {"selling": 1})
 		if(doc.lab_test_rate):
 			make_item_price(item.name, price_list_name, doc.lab_test_rate)
@@ -89,10 +106,10 @@ def create_item_from_template(doc):
 			make_item_price(item.name, price_list_name, 0.0)
 			item.standard_rate = 0.0
 	item.save(ignore_permissions = True)
-	#Set item to the template
+	# Set item in the template
 	frappe.db.set_value("Lab Test Template", doc.name, "item", item.name)
 
-	doc.reload() #refresh the doc after insert.
+	doc.reload()
 
 def make_item_price(item, price_list_name, item_price):
 	frappe.get_doc({
@@ -104,22 +121,13 @@ def make_item_price(item, price_list_name, item_price):
 
 @frappe.whitelist()
 def change_test_code_from_template(lab_test_code, doc):
-	args = json.loads(doc)
-	doc = frappe._dict(args)
+	doc = frappe._dict(json.loads(doc))
 
-	item_exist = frappe.db.exists({
-		"doctype": "Item",
-		"item_code": lab_test_code})
-	if(item_exist):
-		frappe.throw(_("Code {0} already exist").format(lab_test_code))
+	if frappe.db.exists({ "doctype": "Item", "item_code": lab_test_code}):
+		frappe.throw(_("Lab Test Item {0} already exist").format(lab_test_code))
 	else:
 		rename_doc("Item", doc.name, lab_test_code, ignore_permissions=True)
-		frappe.db.set_value("Lab Test Template",doc.name,"lab_test_code",lab_test_code)
+		frappe.db.set_value("Lab Test Template", doc.name, "lab_test_code", lab_test_code)
+		frappe.db.set_value("Lab Test Template", doc.name, "lab_test_name", lab_test_code)
 		rename_doc("Lab Test Template", doc.name, lab_test_code, ignore_permissions=True)
-	return lab_test_code
-
-@frappe.whitelist()
-def disable_enable_test_template(status, name,  is_billable):
-	frappe.db.set_value("Lab Test Template",name,"disabled",status)
-	if(is_billable == 1):
-		frappe.db.set_value("Item",name,"disabled",status)
+	return lab_test_code

erpnext/healthcare/doctype/lab_test_template/lab_test_template_list.js

@@ -3,13 +3,5 @@
 */
 frappe.listview_settings['Lab Test Template'] = {
 	add_fields: ["lab_test_name", "lab_test_code", "lab_test_rate"],
-	filters:[["disabled","=",0]],
-	/*	get_indicator: function(doc) {
-		if(doc.disabled==1){
-        		return [__("Disabled"), "red", "disabled,=,Disabled"];
-        	}
-		if(doc.disabled==0){
-        		return [__("Enabled"), "green", "disabled,=,0"];
-        	}
-	}		*/
+	filters: [["disabled", "=", 0]]
 };

erpnext/hr/doctype/attendance/attendance.py

@@ -14,7 +14,7 @@ class Attendance(Document):
 	def validate_duplicate_record(self):
 		res = frappe.db.sql("""select name from `tabAttendance` where employee = %s and attendance_date = %s
 			and name != %s and docstatus != 2""",
-			(self.employee, self.attendance_date, self.name))
+			(self.employee, getdate(self.attendance_date), self.name))
 		if res:
 			frappe.throw(_("Attendance for employee {0} is already marked").format(self.employee))
 

erpnext/hr/doctype/employee_checkin/employee_checkin.js

@@ -2,7 +2,9 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Employee Checkin', {
-	// refresh: function(frm) {
-
-	// }
+	setup: (frm) => {
+		if(!frm.doc.time) {
+			frm.set_value("time", frappe.datetime.now_datetime());
+		}
+	}
 });

erpnext/hr/doctype/employee_checkin/employee_checkin.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "EMP-CKIN-.MM.-.YYYY.-.######",
  "creation": "2019-06-10 11:56:34.536413",
@@ -23,7 +24,6 @@
   {
    "fieldname": "employee",
    "fieldtype": "Link",
-   "in_list_view": 1,
    "label": "Employee",
    "options": "Employee",
    "reqd": 1
@@ -32,14 +32,17 @@
    "fetch_from": "employee.employee_name",
    "fieldname": "employee_name",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Employee Name",
    "read_only": 1
   },
   {
    "fieldname": "log_type",
    "fieldtype": "Select",
+   "in_list_view": 1,
    "label": "Log Type",
-   "options": "\nIN\nOUT"
+   "options": "\nIN\nOUT",
+   "reqd": 1
   },
   {
    "fieldname": "shift",
@@ -58,6 +61,7 @@
    "fieldtype": "Datetime",
    "in_list_view": 1,
    "label": "Time",
+   "permlevel": 1,
    "reqd": 1
   },
   {
@@ -103,7 +107,8 @@
    "label": "Shift Actual End"
   }
  ],
- "modified": "2019-07-23 23:47:33.975263",
+ "links": [],
+ "modified": "2020-01-23 04:57:42.551355",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Checkin",
@@ -147,9 +152,58 @@
    "role": "HR User",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "Employee",
+   "write": 1
+  },
+  {
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "permlevel": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "permlevel": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "permlevel": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "permlevel": 1,
+   "read": 1,
+   "role": "Employee"
   }
  ],
  "sort_field": "modified",
  "sort_order": "ASC",
+ "title_field": "employee_name",
  "track_changes": 1
 }

erpnext/hr/doctype/leave_application/leave_application.py

@@ -528,8 +528,7 @@ def get_pending_leaves_for_period(employee, leave_type, from_date, to_date):
 
 def get_remaining_leaves(allocation, leaves_taken, date, expiry):
 	''' Returns minimum leaves remaining after comparing with remaining days for allocation expiry '''
-	def _get_remaining_leaves(allocated_leaves, end_date):
-		remaining_leaves = flt(allocated_leaves) + flt(leaves_taken)
+	def _get_remaining_leaves(remaining_leaves, end_date):
 
 		if remaining_leaves > 0:
 			remaining_days = date_diff(end_date, date) + 1
@@ -537,10 +536,11 @@ def get_remaining_leaves(allocation, leaves_taken, date, expiry):
 
 		return remaining_leaves
 
-	total_leaves = allocation.total_leaves_allocated
+	total_leaves = flt(allocation.total_leaves_allocated) + flt(leaves_taken)
 
 	if expiry and allocation.unused_leaves:
-		remaining_leaves = _get_remaining_leaves(allocation.unused_leaves, expiry)
+		remaining_leaves = flt(allocation.unused_leaves) + flt(leaves_taken)
+		remaining_leaves = _get_remaining_leaves(remaining_leaves, expiry)
 
 		total_leaves = flt(allocation.new_leaves_allocated) + flt(remaining_leaves)
 

erpnext/hr/doctype/staffing_plan/test_staffing_plan.py

@@ -14,7 +14,7 @@ test_dependencies = ["Designation"]
 class TestStaffingPlan(unittest.TestCase):
 	def test_staffing_plan(self):
 		_set_up()
-		frappe.db.set_value("Company", "_Test Company", "is_group", 1)
+		frappe.db.set_value("Company", "_Test Company 3", "is_group", 1)
 		if frappe.db.exists("Staffing Plan", "Test"):
 			return
 		staffing_plan = frappe.new_doc("Staffing Plan")
@@ -36,7 +36,7 @@ class TestStaffingPlan(unittest.TestCase):
 		if frappe.db.exists("Staffing Plan", "Test 1"):
 			return
 		staffing_plan = frappe.new_doc("Staffing Plan")
-		staffing_plan.company = "_Test Company"
+		staffing_plan.company = "_Test Company 3"
 		staffing_plan.name = "Test 1"
 		staffing_plan.from_date = nowdate()
 		staffing_plan.to_date = add_days(nowdate(), 10)
@@ -52,7 +52,7 @@ class TestStaffingPlan(unittest.TestCase):
 		if frappe.db.exists("Staffing Plan", "Test"):
 			return
 		staffing_plan = frappe.new_doc("Staffing Plan")
-		staffing_plan.company = "_Test Company"
+		staffing_plan.company = "_Test Company 3"
 		staffing_plan.name = "Test"
 		staffing_plan.from_date = nowdate()
 		staffing_plan.to_date = add_days(nowdate(), 10)
@@ -87,10 +87,11 @@ def _set_up():
 def make_company():
 	if frappe.db.exists("Company", "_Test Company 10"):
 		return
+
 	company = frappe.new_doc("Company")
 	company.company_name = "_Test Company 10"
 	company.abbr = "_TC10"
-	company.parent_company = "_Test Company"
+	company.parent_company = "_Test Company 3"
 	company.default_currency = "INR"
 	company.country = "Pakistan"
 	company.insert()

erpnext/manufacturing/doctype/bom/bom.py

@@ -47,7 +47,18 @@ class BOM(WebsiteGenerator):
 		else:
 			idx = 1
 
-		self.name = 'BOM-' + self.item + ('-%.3i' % idx)
+		name = 'BOM-' + self.item + ('-%.3i' % idx)
+		if frappe.db.exists("BOM", name):
+			conflicting_bom = frappe.get_doc("BOM", name)
+
+			if conflicting_bom.item != self.item:
+
+				frappe.throw(_("""A BOM with name {0} already exists for item {1}.
+					<br> Did you rename the item? Please contact Administrator / Tech support
+				""").format(frappe.bold(name), frappe.bold(conflicting_bom.item)))
+
+		self.name = name
+
 
 	def validate(self):
 		self.route = frappe.scrub(self.name).replace('_', '-')
@@ -783,11 +794,12 @@ def add_non_stock_items_cost(stock_entry, work_order, expense_account):
 	for name in non_stock_items:
 		non_stock_items_cost += flt(items.get(name[0])) * flt(stock_entry.fg_completed_qty) / flt(bom.quantity)
 
-	stock_entry.append('additional_costs', {
-		'expense_account': expense_account,
-		'description': _("Non stock items"),
-		'amount': non_stock_items_cost
-	})
+	if non_stock_items_cost:
+		stock_entry.append('additional_costs', {
+			'expense_account': expense_account,
+			'description': _("Non stock items"),
+			'amount': non_stock_items_cost
+		})
 
 def add_operations_cost(stock_entry, work_order=None, expense_account=None):
 	from erpnext.stock.doctype.stock_entry.stock_entry import get_operating_cost_per_unit
@@ -804,11 +816,12 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None):
 		additional_operating_cost_per_unit = \
 			flt(work_order.additional_operating_cost) / flt(work_order.qty)
 
-		stock_entry.append('additional_costs', {
-			"expense_account": expense_account,
-			"description": "Additional Operating Cost",
-			"amount": additional_operating_cost_per_unit * flt(stock_entry.fg_completed_qty)
-		})
+		if additional_operating_cost_per_unit:
+			stock_entry.append('additional_costs', {
+				"expense_account": expense_account,
+				"description": "Additional Operating Cost",
+				"amount": additional_operating_cost_per_unit * flt(stock_entry.fg_completed_qty)
+			})
 
 @frappe.whitelist()
 def get_bom_diff(bom1, bom2):

erpnext/manufacturing/doctype/production_plan/production_plan.json

@@ -225,6 +225,7 @@
    "options": "Warehouse"
   },
   {
+   "depends_on": "eval:!doc.__islocal",
    "fieldname": "download_materials_required",
    "fieldtype": "Button",
    "label": "Download Required Materials"
@@ -296,7 +297,7 @@
  "icon": "fa fa-calendar",
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-04 15:58:50.940460",
+ "modified": "2020-01-21 19:13:10.113854",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan",

erpnext/manufacturing/doctype/production_plan/production_plan.py

@@ -732,6 +732,6 @@ def get_sub_assembly_items(bom_no, bom_data):
 				})
 
 			bom_item = bom_data.get(key)
-			bom_item["stock_qty"] += d.stock_qty
+			bom_item["stock_qty"] += d.stock_qty / d.parent_bom_qty
 
 			get_sub_assembly_items(bom_item.get("bom_no"), bom_data)

erpnext/projects/doctype/task/task.py

@@ -56,8 +56,8 @@ class Task(NestedSet):
 	def validate_status(self):
 		if self.status!=self.get_db_value("status") and self.status == "Completed":
 			for d in self.depends_on:
-				if frappe.db.get_value("Task", d.task, "status") != "Completed":
-					frappe.throw(_("Cannot close task {0} as its dependant task {1} is not closed.").format(frappe.bold(self.name), frappe.bold(d.task)))
+				if frappe.db.get_value("Task", d.task, "status") not in ("Completed", "Cancelled"):
+					frappe.throw(_("Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.").format(frappe.bold(self.name), frappe.bold(d.task)))
 
 			close_all_assignments(self.doctype, self.name)
 

erpnext/public/js/controllers/transaction.js

@@ -968,7 +968,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 	qty: function(doc, cdt, cdn) {
 		let item = frappe.get_doc(cdt, cdn);
-		this.conversion_factor(doc, cdt, cdn, false);
+		this.conversion_factor(doc, cdt, cdn, true);
 		this.apply_pricing_rule(item, true);
 	},
 

erpnext/public/js/utils/serial_no_batch_selector.js

@@ -316,7 +316,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
 								frappe.call({
 									method: 'erpnext.stock.doctype.batch.batch.get_batch_qty',
 									args: {
-										batch_no: this.doc.batch_no,
+										batch_no: me.item.batch_no,
 										warehouse: me.warehouse_details.name,
 										item_code: me.item_code
 									},
@@ -389,10 +389,13 @@ erpnext.SerialNoBatchSelector = Class.extend({
 
 		let serial_no_filters = {
 			item_code: me.item_code,
-			batch_no: this.doc.batch_no || null,
 			delivery_document_no: ""
 		}
 
+		if (this.has_batch) {
+			serial_no_filters["batch_no"] = this.item.batch_no;
+		}
+
 		if (me.warehouse_details.name) {
 			serial_no_filters['warehouse'] = me.warehouse_details.name;
 		}

erpnext/selling/doctype/customer/customer.json

@@ -322,8 +322,9 @@
   },
   {
    "fieldname": "primary_address",
-   "fieldtype": "Read Only",
-   "label": "Primary Address"
+   "fieldtype": "Text",
+   "label": "Primary Address",
+   "read_only": 1
   },
   {
    "collapsible": 1,
@@ -469,7 +470,7 @@
  "icon": "fa fa-user",
  "idx": 363,
  "image_field": "image",
- "modified": "2019-09-06 12:40:31.801424",
+ "modified": "2020-01-24 15:07:48.815546",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer",

erpnext/selling/doctype/quotation/quotation.py

@@ -182,8 +182,12 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
 	return doclist
 
 def set_expired_status():
-	frappe.db.sql("""UPDATE `tabQuotation` SET `status` = 'Expired'
-		WHERE `status` != "Expired" AND `valid_till` < %s""", (nowdate()))
+	frappe.db.sql("""
+		UPDATE
+			`tabQuotation` SET `status` = 'Expired'
+		WHERE
+			`status` not in ('Ordered', 'Expired', 'Lost', 'Cancelled') AND `valid_till` < %s
+		""", (nowdate()))
 
 @frappe.whitelist()
 def make_sales_invoice(source_name, target_doc=None):

erpnext/setup/doctype/company/company.js

@@ -4,6 +4,15 @@
 frappe.provide("erpnext.company");
 
 frappe.ui.form.on("Company", {
+	onload: function(frm) {
+		if (frm.doc.__islocal && frm.doc.parent_company) {
+			frappe.db.get_value('Company', frm.doc.parent_company, 'is_group', (r) => {
+				if (!r.is_group) {
+					frm.set_value('parent_company', '');
+				}
+			});
+		}
+	},
 	setup: function(frm) {
 		erpnext.company.setup_queries(frm);
 		frm.set_query("hra_component", function(){

erpnext/setup/doctype/company/company.py

@@ -47,6 +47,7 @@ class Company(NestedSet):
 		self.validate_perpetual_inventory()
 		self.check_country_change()
 		self.set_chart_of_accounts()
+		self.validate_parent_company()
 
 	def validate_abbr(self):
 		if not self.abbr:
@@ -189,6 +190,13 @@ class Company(NestedSet):
 			self.create_chart_of_accounts_based_on = "Existing Company"
 			self.existing_company = self.parent_company
 
+	def validate_parent_company(self):
+		if self.parent_company:
+			is_group = frappe.get_value('Company', self.parent_company, 'is_group')
+
+			if not is_group:
+				frappe.throw(_("Parent Company must be a group company"))
+
 	def set_default_accounts(self):
 		default_accounts = {
 			"default_cash_account": "Cash",

erpnext/setup/doctype/item_group/item_group.py

@@ -119,7 +119,7 @@ def get_product_list_for_group(product_group=None, start=0, limit=10, search=Non
 				or I.name like %(search)s)"""
 		search = "%" + cstr(search) + "%"
 
-	query += """order by I.weightage desc, in_stock desc, I.modified desc limit %s, %s""" % (start, limit)
+	query += """order by I.weightage desc, in_stock desc, I.modified desc limit %s, %s""" % (cint(start), cint(limit))
 
 	data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1)
 	data = adjust_qty_for_expired_items(data)

erpnext/shopping_cart/product_info.py

@@ -7,7 +7,7 @@ import frappe
 from erpnext.shopping_cart.cart import _get_cart_quotation
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
 	import get_shopping_cart_settings, show_quantity_in_website
-from erpnext.utilities.product import get_price, get_qty_in_stock
+from erpnext.utilities.product import get_price, get_qty_in_stock, get_non_stock_item_status
 
 @frappe.whitelist(allow_guest=True)
 def get_product_info_for_website(item_code):
@@ -31,7 +31,7 @@ def get_product_info_for_website(item_code):
 	product_info = {
 		"price": price,
 		"stock_qty": stock_status.stock_qty,
-		"in_stock": stock_status.in_stock if stock_status.is_stock_item else 1,
+		"in_stock": stock_status.in_stock if stock_status.is_stock_item else get_non_stock_item_status(item_code, "website_warehouse"),
 		"qty": 0,
 		"uom": frappe.db.get_value("Item", item_code, "stock_uom"),
 		"show_stock_qty": show_quantity_in_website(),

erpnext/stock/doctype/delivery_note/delivery_note.js

@@ -92,6 +92,17 @@ frappe.ui.form.on("Delivery Note", {
 			}, __('Create'));
 			frm.page.set_inner_btn_group_as_primary(__('Create'));
 		}
+	},
+
+	to_warehouse: function(frm) {
+		if(frm.doc.to_warehouse) {
+			["items", "packed_items"].forEach(doctype => {
+				frm.doc[doctype].forEach(d => {
+					frappe.model.set_value(d.doctype, d.name,
+						"target_warehouse", frm.doc.to_warehouse);
+				});
+			});
+		}
 	}
 });
 

erpnext/stock/doctype/delivery_trip/delivery_trip.json

@@ -165,6 +165,7 @@
   },
   {
    "fetch_from": "driver.address",
+   "fetch_if_empty": 1,
    "fieldname": "driver_address",
    "fieldtype": "Link",
    "label": "Driver Address",
@@ -179,7 +180,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-06 17:06:59.681952",
+ "modified": "2020-01-26 22:37:14.824021",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Trip",

erpnext/stock/doctype/item_price/item_price.py

@@ -13,7 +13,7 @@ from frappe.model.document import Document
 
 
 class ItemPrice(Document):
-	
+
 	def validate(self):
 		self.validate_item()
 		self.validate_dates()
@@ -51,7 +51,7 @@ class ItemPrice(Document):
 	def check_duplicates(self):
 		conditions = "where item_code=%(item_code)s and price_list=%(price_list)s and name != %(name)s"
 
-		for field in ['uom', 'min_qty', 'valid_from',
+		for field in ['uom', 'valid_from',
 			'valid_upto', 'packing_unit', 'customer', 'supplier']:
 			if self.get(field):
 				conditions += " and {0} = %({1})s".format(field, field)

erpnext/stock/doctype/item_price/test_item_price.py

@@ -21,7 +21,7 @@ class TestItemPrice(unittest.TestCase):
 	def test_addition_of_new_fields(self):
 		# Based on https://github.com/frappe/erpnext/issues/8456
 		test_fields_existance = [
-			'supplier', 'customer', 'uom', 'min_qty', 'lead_time_days',
+			'supplier', 'customer', 'uom', 'lead_time_days',
 			'packing_unit', 'valid_from', 'valid_upto', 'note'
 		]
 		doc_fields = frappe.copy_doc(test_records[1]).__dict__.keys()
@@ -43,7 +43,6 @@ class TestItemPrice(unittest.TestCase):
 
 		args = {
 			"price_list": doc.price_list,
-			"min_qty": doc.min_qty,
             "customer": doc.customer,
             "uom": "_Test UOM",
             "transaction_date": '2017-04-18',
@@ -58,7 +57,6 @@ class TestItemPrice(unittest.TestCase):
 		doc = frappe.copy_doc(test_records[2])
 		args = {
 			"price_list": doc.price_list,
-			"min_qty": 30,
 			"customer": doc.customer,
 			"uom": "_Test UOM",
             "transaction_date": '2017-04-18',
@@ -74,7 +72,6 @@ class TestItemPrice(unittest.TestCase):
 
 		args = {
 			"price_list": doc.price_list,
-			"min_qty": doc.min_qty,
 			"customer": "_Test Customer",
 			"uom": "_Test UOM",
 			"transaction_date": '2017-04-18',
@@ -90,7 +87,6 @@ class TestItemPrice(unittest.TestCase):
 
 		args = {
 			"price_list": doc.price_list,
-			"min_qty": doc.min_qty,
 			"qty": 7,
 			"uom": "_Test UOM",
 			"transaction_date": "01-15-2019"
@@ -105,7 +101,6 @@ class TestItemPrice(unittest.TestCase):
 
 		args = {
 			"price_list": doc.price_list,
-			"min_qty": doc.min_qty,
             "customer": "_Test Customer",
             "uom": "_Test UOM",
 			"transaction_date": "2017-04-25",
@@ -121,7 +116,6 @@ class TestItemPrice(unittest.TestCase):
 
 		args = {
 			"price_list": doc.price_list,
-			"min_qty": doc.min_qty,
 			"uom": "_Test UOM",
 			"qty": 7,
 		}

erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

@@ -195,6 +195,7 @@ class PurchaseReceipt(BuyingController):
 		# because updating ordered qty in bin depends upon updated ordered qty in PO
 		self.update_stock_ledger()
 		self.make_gl_entries_on_cancel()
+		self.delete_auto_created_batches()
 
 	def get_current_stock(self):
 		for d in self.get('supplied_items'):

erpnext/stock/doctype/stock_entry/stock_entry.js

@@ -840,18 +840,10 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 					if (me.frm.doc.purpose == "Manufacture" || me.frm.doc.purpose == "Material Consumption for Manufacture" ) {
 						if (me.frm.doc.purpose == "Manufacture") {
 							if (!me.frm.doc.to_warehouse) me.frm.set_value("to_warehouse", r.message["fg_warehouse"]);
-							if (r.message["additional_costs"].length) {
-								me.frm.clear_table("additional_costs");
-
-								$.each(r.message["additional_costs"], function(i, row) {
-									me.frm.add_child("additional_costs", row);
-								})
-								refresh_field("additional_costs");
-							}
 						}
 						if (!me.frm.doc.from_warehouse) me.frm.set_value("from_warehouse", r.message["wip_warehouse"]);
 					}
-					me.get_items()
+					me.get_items();
 				}
 			}
 		});

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -110,6 +110,7 @@ class StockEntry(StockController):
 		self.update_cost_in_project()
 		self.update_transferred_qty()
 		self.update_quality_inspection()
+		self.delete_auto_created_batches()
 
 	def set_job_card_data(self):
 		if self.job_card and not self.work_order:
@@ -484,7 +485,7 @@ class StockEntry(StockController):
 					if self.work_order \
 						and frappe.db.get_single_value("Manufacturing Settings", "material_consumption"):
 						bom_items = self.get_bom_raw_materials(d.transfer_qty)
-						raw_material_cost = sum([flt(d.qty)*flt(d.rate) for d in bom_items.values()])
+						raw_material_cost = sum([flt(row.qty)*flt(row.rate) for row in bom_items.values()])
 
 					if raw_material_cost:
 						d.basic_rate = flt((raw_material_cost - scrap_material_cost) / flt(d.transfer_qty), d.precision("basic_rate"))
@@ -614,7 +615,7 @@ class StockEntry(StockController):
 		if self.work_order and self.purpose == "Manufacture":
 			allowed_qty = wo_qty + (allowance_percentage/100 * wo_qty)
 			if self.fg_completed_qty > allowed_qty:
-				frappe.throw(_("For quantity {0} should not be grater than work order quantity {1}")
+				frappe.throw(_("For quantity {0} should not be greater than work order quantity {1}")
 					.format(flt(self.fg_completed_qty), wo_qty))
 
 			if production_item not in items_with_target_warehouse:
@@ -682,6 +683,8 @@ class StockEntry(StockController):
 		if item_account_wise_additional_cost:
 			for d in self.get("items"):
 				for account, amount in iteritems(item_account_wise_additional_cost.get((d.item_code, d.name), {})):
+					if not amount: continue
+
 					gl_entries.append(self.get_gl_dict({
 						"account": account,
 						"against": d.expense_account,
@@ -1401,8 +1404,7 @@ def get_work_order_details(work_order, company):
 		"use_multi_level_bom": work_order.use_multi_level_bom,
 		"wip_warehouse": work_order.wip_warehouse,
 		"fg_warehouse": work_order.fg_warehouse,
-		"fg_completed_qty": pending_qty_to_produce,
-		"additional_costs": get_additional_costs(work_order, fg_qty=pending_qty_to_produce, company=company)
+		"fg_completed_qty": pending_qty_to_produce
 	}
 
 def get_operating_cost_per_unit(work_order=None, bom_no=None):

erpnext/stock/get_item_details.py

@@ -583,7 +583,7 @@ def get_item_price(args, item_code, ignore_party=False):
 		Get name, price_list_rate from Item Price based on conditions
 			Check if the desired qty is within the increment of the packing list.
 		:param args: dict (or frappe._dict) with mandatory fields price_list, uom
-			optional fields min_qty, transaction_date, customer, supplier
+			optional fields transaction_date, customer, supplier
 		:param item_code: str, Item Doctype field item_code
 	"""
 
@@ -601,24 +601,16 @@ def get_item_price(args, item_code, ignore_party=False):
 		else:
 			conditions += " and (customer is null or customer = '') and (supplier is null or supplier = '')"
 
-	if args.get('min_qty'):
-		conditions += " and ifnull(min_qty, 0) <= %(min_qty)s"
-
 	if args.get('transaction_date'):
 		conditions += """ and %(transaction_date)s between
 			ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31')"""
 
 	return frappe.db.sql(""" select name, price_list_rate, uom
 		from `tabItem Price` {conditions}
-		order by valid_from desc, min_qty desc, uom desc """.format(conditions=conditions), args)
+		order by valid_from desc, uom desc """.format(conditions=conditions), args)
 
 def get_price_list_rate_for(args, item_code):
 	"""
-		Return Price Rate based on min_qty of each Item Price Rate.\
-		For example, desired qty is 10 and Item Price Rates exists
-		for min_qty 9 and min_qty 20. It returns Item Price Rate for qty 9 as
-		the best fit in the range of avaliable min_qtyies
-
 		:param customer: link to Customer DocType
 		:param supplier: link to Supplier DocType
 		:param price_list: str (Standard Buying or Standard Selling)
@@ -632,8 +624,6 @@ def get_price_list_rate_for(args, item_code):
 			"customer": args.get('customer'),
 			"supplier": args.get('supplier'),
 			"uom": args.get('uom'),
-			"min_qty": args.get('qty') if args.get('price_list_uom_dependant')\
-				else flt(args.get('qty')) * flt(args.get("conversion_factor", 1)),
 			"transaction_date": args.get('transaction_date'),
 	}
 
@@ -649,9 +639,6 @@ def get_price_list_rate_for(args, item_code):
 
 		general_price_list_rate = get_item_price(item_price_args, item_code,
 			ignore_party=args.get("ignore_party"))
-		if not general_price_list_rate:
-			del item_price_args["min_qty"]
-			general_price_list_rate = get_item_price(item_price_args, item_code, ignore_party=args.get("ignore_party"))
 
 		if not general_price_list_rate and args.get("uom") != args.get("stock_uom"):
 			item_price_args["uom"] = args.get("stock_uom")

erpnext/translations/da_dk.csv

@@ -14,7 +14,7 @@ DocType: Pricing Rule,Selling,Selling
 DocType: Sales Order,%  Delivered,% Leveres
 DocType: Lead,Lead Owner,Bly Owner
 apps/erpnext/erpnext/controllers/stock_controller.py,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/config/accounting.py,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/config/accounts.py,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
 apps/erpnext/erpnext/controllers/accounts_controller.py, or ,o
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)

erpnext/translations/en_us.csv

@@ -1,6 +1,5 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html,Cheques Required,Checks Required
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row #{0}: Clearance date {1} cannot be before Check Date {2}
-apps/erpnext/erpnext/utilities/user_progress.py,People who teach at your organisation,People who teach at your organization
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave cannot be applied/canceled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before canceling this Warranty Claim
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,"Appointment cancelled, Please review and cancel the invoice {0}","Appointment canceled, Please review and cancel the invoice {0}"
@@ -22,7 +21,7 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Maintenance Sche
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment on Cancelation of Invoice
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery Notes {0} must be canceled before cancelling this Sales Order
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Work Order {0} must be cancelled before cancelling this Sales Order,Work Order {0} must be canceled before cancelling this Sales Order
-apps/erpnext/erpnext/config/accounting.py,Setup cheque dimensions for printing,Setup check dimensions for printing
+apps/erpnext/erpnext/config/accounts.py,Setup cheque dimensions for printing,Setup check dimensions for printing
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Checks and Deposits incorrectly cleared
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} is cancelled so the action cannot be completed,{0} {1} is canceled so the action cannot be completed
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Packing Slip(s) cancelled,Packing Slip(s) canceled

erpnext/translations/es_cl.csv

@@ -26,7 +26,6 @@ DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de cursos
 DocType: Shopping Cart Settings,Checkout Settings,Ajustes de Finalización de Pedido
 DocType: Guardian Interest,Guardian Interest,Interés del Guardián
-apps/erpnext/erpnext/utilities/user_progress.py,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las lecturas se pueden programar."
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Checkout,Finalizando pedido
 DocType: Guardian Student,Guardian Student,Guardián del Estudiante
 DocType: BOM Operation,Base Hour Rate(Company Currency),Tarifa Base por Hora (Divisa de Compañía)

erpnext/translations/es_gt.csv

@@ -5,5 +5,6 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} on Half day Leave on {1},{0} en Medio día Permiso en {1}
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py,Outstanding Amt,Saldo Pendiente
 DocType: Bank Statement Transaction Invoice Item,Outstanding Amount,Saldo Pendiente
+DocType: Manufacturing Settings,Other Settings,Otros Ajustes
 DocType: Payment Entry Reference,Outstanding,Pendiente
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} on Leave on {1},{0} De permiso De permiso {1}

erpnext/translations/es_ni.csv

@@ -1,7 +1,7 @@
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio de Monto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Bill of Materials,Lista de Materiales
-apps/erpnext/erpnext/controllers/accounts_controller.py,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
 DocType: Purchase Invoice,Tax ID,RUC
 DocType: BOM Item,Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
 DocType: Timesheet Detail,Bill,Factura

erpnext/translations/es_pe.csv

@@ -24,7 +24,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: {1
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Row # {0}:,Fila # {0}:
 DocType: Sales Invoice,Vehicle No,Vehículo No
 DocType: Work Order Operation,Work In Progress,Trabajos en Curso
-DocType: Daily Work Summary Group,Holiday List,Lista de Feriados
+DocType: Appointment Booking Settings,Holiday List,Lista de Feriados
 DocType: Cost Center,Stock User,Foto del usuario
 DocType: Company,Phone No,Teléfono No
 ,Sales Partners Commission,Comisiones de Ventas
@@ -104,7 +104,6 @@ DocType: Purchase Invoice,Unpaid,No pagado
 DocType: Packing Slip,From Package No.,Del Paquete N º
 DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
-apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Administrative Officer,Oficial Administrativo
 apps/erpnext/erpnext/stock/doctype/item/item.py,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
@@ -161,7 +160,6 @@ apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"To filter
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
 apps/erpnext/erpnext/regional/italy/utils.py,Nos,Números
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
-DocType: Supplier Quotation,Stopped,Detenido
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
 apps/erpnext/erpnext/config/support.py,Support Analytics,Analitico de Soporte
 DocType: Item,Website Warehouse,Almacén del Sitio Web
@@ -241,7 +239,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Accounting Ledger,Libro Mayor Contable
 DocType: BOM,Item Description,Descripción del Artículo
 DocType: Purchase Invoice,Supplied Items,Artículos suministrados
-DocType: Work Order,Qty To Manufacture,Cantidad Para Fabricación
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Qty To Manufacture,Cantidad Para Fabricación
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Item Default,Default Buying Cost Center,Centro de Costos Por Defecto
@@ -251,7 +249,6 @@ apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Case No(s) alrea
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
 DocType: Employee,Place of Issue,Lugar de emisión
 apps/erpnext/erpnext/controllers/selling_controller.py,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
-apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,Sus productos o servicios
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
@@ -271,7 +268,7 @@ apps/erpnext/erpnext/stock/utils.py,Serial number {0} entered more than once,Nú
 DocType: Bank Statement Transaction Invoice Item,Journal Entry,Asientos Contables
 DocType: Target Detail,Target Distribution,Distribución Objetivo
 DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
-DocType: Contract,HR Manager,Gerente de Recursos Humanos
+DocType: Appointment Booking Settings,HR Manager,Gerente de Recursos Humanos
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Privilege Leave,Permiso con Privilegio
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
@@ -283,7 +280,6 @@ DocType: Maintenance Schedule Item,No of Visits,No. de visitas
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
 DocType: Quotation,Shopping Cart,Cesta de la compra
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
-apps/erpnext/erpnext/projects/doctype/task/task.py,'Expected Start Date' can not be greater than 'Expected End Date',La 'Fecha de inicio estimada' no puede ser mayor que la 'Fecha de finalización estimada'
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
@@ -499,7 +495,7 @@ apps/erpnext/erpnext/hr/doctype/employee/employee.py,Contract End Date must be g
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
-apps/erpnext/erpnext/config/accounting.py,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
+apps/erpnext/erpnext/config/accounts.py,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
 DocType: Warranty Claim,Service Address,Dirección del Servicio
 DocType: Purchase Invoice Item,Manufacture,Manufactura
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
@@ -572,7 +568,6 @@ DocType: Purchase Invoice Item,Manufacturer Part Number,Número de Pieza del Fab
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Expense Account,Cuenta de gastos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Software,Software
-DocType: Email Campaign,Scheduled,Programado
 apps/erpnext/erpnext/config/selling.py,Manage Sales Partners.,Administrar Puntos de venta.
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py,Name or Email is mandatory,Nombre o Email es obligatorio
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Root Type is mandatory,Tipo Root es obligatorio
@@ -599,7 +594,7 @@ DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial No {0} not in stock,Número de orden {0} no está en stock
-apps/erpnext/erpnext/config/accounting.py,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
+apps/erpnext/erpnext/config/accounts.py,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Sales Invoice,Write Off Outstanding Amount,Cantidad de desajuste
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida Predeterminada para Inventario
 DocType: Employee Education,School/University,Escuela / Universidad
@@ -665,7 +660,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0}
 DocType: Item,Supplier Items,Artículos del Proveedor
 DocType: Employee Transfer,New Company,Nueva Empresa
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
+apps/erpnext/erpnext/education/doctype/student/student.py,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js,Set as Open,Establecer como abierto
 DocType: Sales Team,Contribution (%),Contribución (%)
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
@@ -674,7 +669,7 @@ DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y
 apps/erpnext/erpnext/accounts/doctype/item_tax_template/item_tax_template.py,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Automotive,Automotor
-DocType: Cashier Closing,From Time,Desde fecha
+DocType: Appointment Booking Slots,From Time,Desde fecha
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Investment Banking,Banca de Inversión
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
@@ -694,7 +689,7 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cost Center wit
 DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
-apps/erpnext/erpnext/config/accounting.py,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
+apps/erpnext/erpnext/config/accounts.py,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 apps/erpnext/erpnext/controllers/trends.py,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transferencia de material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
@@ -707,6 +702,7 @@ DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
 DocType: Quotation Lost Reason,Quotation Lost Reason,Cotización Pérdida Razón
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Por favor seleccione trasladar, si usted desea incluir los saldos del año fiscal anterior a este año"
 DocType: Serial No,Creation Document Type,Tipo de creación de documentos
+apps/erpnext/erpnext/accounts/general_ledger.py,Make Journal Entry,Haga Comprobante de Diario
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
 apps/erpnext/erpnext/controllers/trends.py,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: Project,Expected End Date,Fecha de finalización prevista
@@ -764,7 +760,6 @@ apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Supplier Qu
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
 apps/erpnext/erpnext/stock/doctype/item/item.py,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 apps/erpnext/erpnext/config/selling.py,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
-apps/erpnext/erpnext/utilities/user_progress.py,user@example.com,user@example.com
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Brokerage,Brokerage
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
@@ -806,7 +801,7 @@ apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stoc
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} does not exist,Almacén {0} no existe
 DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
-DocType: Project,Customer Details,Datos del Cliente
+DocType: Appointment,Customer Details,Datos del Cliente
 DocType: Employee,Reports to,Informes al
 DocType: Customer Feedback,Quality Management,Gestión de la Calidad
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
@@ -916,7 +911,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py,Report Type is mandator
 DocType: Item,Serial Number Series,Número de Serie Serie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Retail & Wholesale,Venta al por menor y al por mayor
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py,Successfully Reconciled,Reconciliado con éxito
-apps/erpnext/erpnext/config/buying.py,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
+apps/erpnext/erpnext/config/accounts.py,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
 ,Item Prices,Precios de los Artículos
 DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
@@ -943,7 +938,7 @@ DocType: Assessment Plan,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
 DocType: Selling Settings,Campaign Naming By,Nombramiento de la Campaña Por
-apps/erpnext/erpnext/config/accounting.py,Accounting journal entries.,Entradas en el diario de contabilidad.
+apps/erpnext/erpnext/config/accounts.py,Accounting journal entries.,Entradas en el diario de contabilidad.
 DocType: Account,Stock,Existencias
 DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
 DocType: Employee,Contract End Date,Fecha Fin de Contrato

erpnext/translations/he.csv

@@ -74,12 +74,12 @@ DocType: Payment Entry Reference,Allocated,הוקצה
 DocType: Payroll Entry,Employee Details,פרטי עובד
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,צור שכר Slip
+DocType: Manufacturing Settings,Other Settings,הגדרות אחרות
 DocType: POS Profile,Price List,מחיר מחירון
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Please enter Receipt Document,נא להזין את מסמך הקבלה
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
 DocType: GL Entry,Against Voucher,נגד שובר
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/utilities/user_progress.py,user@example.com,user@example.com
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Bank Account,Address HTML,כתובת HTML
 DocType: Salary Slip,Hour Rate,שעה שערי
@@ -105,7 +105,7 @@ DocType: Item Default,Default Supplier,ספק ברירת מחדל
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
 DocType: Work Order,Item To Manufacture,פריט לייצור
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,אנא להגדיר מסנן מבוסס על פריט או מחסן
+apps/erpnext/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py,Please set filter based on Item or Warehouse,אנא להגדיר מסנן מבוסס על פריט או מחסן
 DocType: Cheque Print Template,Distance from left edge,מרחק הקצה השמאלי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Debtors,חייבים
 DocType: Account,Receivable,חייבים
@@ -134,7 +134,6 @@ apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,There is
 DocType: Purchase Invoice Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
 DocType: Timesheet,Billed,מחויב
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
-DocType: Employee,You can enter any date manually,אתה יכול להיכנס לכל תאריך באופן ידני
 DocType: Account,Tax,מס
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
 apps/erpnext/erpnext/config/settings.py,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ערכי ברירת מחדל שנקבעו כמו חברה, מטבע, שנת כספים הנוכחית, וכו '"
@@ -155,7 +154,6 @@ DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Item,Sales Details,פרטי מכירות
 DocType: Budget,Ignore,התעלם
 DocType: Purchase Invoice Item,Accepted Warehouse,מחסן מקובל
-apps/erpnext/erpnext/utilities/user_progress.py,Add Users,הוסף משתמשים
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Salary Slip,Salary Structure,שכר מבנה
 DocType: Installation Note Item,Installation Note Item,פריט הערה התקנה
@@ -186,7 +184,6 @@ DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטו
 DocType: Bank Account,Address and Contact,כתובת ולתקשר
 DocType: Journal Entry,Accounting Entries,רישומים חשבונאיים
 DocType: Budget,Monthly Distribution,בחתך חודשי
-apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py,Outstanding Amt,Amt מצטיין
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py,Repeat Customers,חזרו על לקוחות
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Move Item,פריט העבר
@@ -213,7 +210,7 @@ apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconcil
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},סטודנט הקבוצה שם הוא חובה בשורת {0}
 DocType: Program Enrollment Tool,Program Enrollment Tool,כלי הרשמה לתכנית
 DocType: Pricing Rule,Discount Amount,סכום הנחה
-DocType: Job Card,For Quantity,לכמות
+DocType: Stock Entry,For Quantity,לכמות
 DocType: Purchase Invoice,Start date of current invoice's period,תאריך התחלה של תקופה של החשבונית הנוכחית
 DocType: Quality Inspection,Sample Size,גודל מדגם
 DocType: Supplier,Billing Currency,מטבע חיוב
@@ -234,7 +231,6 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Compensat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
 DocType: Bank Reconciliation Detail,Posting Date,תאריך פרסום
 DocType: Employee,Date of Joining,תאריך ההצטרפות
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,תכנון קיבולת השבת ומעקב זמן
 DocType: Work Order Operation,Operation completed for how many finished goods?,מבצע הושלם לכמה מוצרים מוגמרים?
 DocType: Issue,Support Team,צוות תמיכה
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
@@ -330,13 +326,12 @@ apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_tax
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ערך פתיחה
-apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,רשימה כמה מהספקים שלך. הם יכולים להיות ארגונים או יחידים.
 DocType: Naming Series,Update Series Number,עדכון סדרת מספר
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js,Warranty Claim,הפעיל אחריות
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,עגלה ריקה
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
-apps/erpnext/erpnext/config/accounting.py,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
+apps/erpnext/erpnext/config/accounts.py,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
 apps/erpnext/erpnext/config/settings.py,Country wise default Address Templates,תבניות כתובת ברירת מחדל חכם ארץ
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,זמן גיליון לייצור.
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Opening (Cr),פתיחה (Cr)
@@ -370,7 +365,6 @@ DocType: Job Offer,Awaiting Response,ממתין לתגובה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את "מלאי עדכון ', כי פריטים אינם מועברים באמצעות {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,הלוואות מובטחות
 DocType: SMS Center,All Sales Partner Contact,כל מכירות הפרטנר לתקשר
-DocType: Supplier Quotation,Stopped,נעצר
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),מחיר בסיס (ליחידת מידה)
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 apps/erpnext/erpnext/stock/doctype/item/item.py,Attribute table is mandatory,שולחן תכונה הוא חובה
@@ -424,14 +418,13 @@ apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Attendanc
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,סוג doc
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Projects Settings,Timesheets,גליונות
-apps/erpnext/erpnext/stock/get_item_details.py,Price List not selected,מחיר המחירון לא נבחר
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Broadcasting,שידור
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js,Child nodes can be only created under 'Group' type nodes,בלוטות הילד יכול להיווצר רק תחת צמתים סוג 'קבוצה'
 DocType: Territory,For reference,לעיון
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0} does not exist,חשבון {0} אינו קיים
 DocType: GL Entry,Voucher Type,סוג שובר
-apps/erpnext/erpnext/config/accounting.py,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
+apps/erpnext/erpnext/config/accounts.py,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
 DocType: Asset,Quality Manager,מנהל איכות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
@@ -447,7 +440,7 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} does not exist,פר
 apps/erpnext/erpnext/stock/doctype/item/item.js,Add / Edit Prices,להוסיף מחירים / עריכה
 DocType: BOM,Rate Of Materials Based On,שיעור חומרים הבוסס על
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
-apps/erpnext/erpnext/config/accounting.py,Tree of financial Cost Centers.,עץ מרכזי עלות הכספיים.
+apps/erpnext/erpnext/config/accounts.py,Tree of financial Cost Centers.,עץ מרכזי עלות הכספיים.
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 DocType: Blanket Order,Manufacturing,ייצור
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,{0} can not be negative,{0} אינו יכול להיות שלילי
@@ -506,7 +499,7 @@ DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Bank account cannot be named as {0},חשבון בנק לא יכול להיות שם בתור {0}
 DocType: Item,Average time taken by the supplier to deliver,הזמן הממוצע שנלקח על ידי הספק לספק
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,רכוש קבוע
-DocType: Fees,Fees,אגרות
+DocType: Journal Entry Account,Fees,אגרות
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,מתכנן יומני זמן מחוץ לשעתי עבודה תחנת עבודה.
 DocType: Salary Slip,Working Days,ימי עבודה
 DocType: Employee Education,Graduate,בוגר
@@ -537,7 +530,6 @@ DocType: Blanket Order Item,Ordered Quantity,כמות מוזמנת
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 DocType: Hub Tracked Item,Hub Node,רכזת צומת
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py,Fulfillment,הַגשָׁמָה
-apps/erpnext/erpnext/controllers/selling_controller.py,Order Type must be one of {0},סוג ההזמנה חייבת להיות אחד {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,הוצאה לאור באינטרנט
 DocType: Landed Cost Voucher,Purchase Receipts,תקבולי רכישה
@@ -545,7 +537,6 @@ DocType: Employee Attendance Tool,Marked Attendance,נוכחות בולטת
 DocType: Naming Series,Setup Series,סדרת התקנה
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,המוקדם
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM {0} must be submitted,BOM {0} יש להגיש
-DocType: Asset,Naming Series,סדרת שמות
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 apps/erpnext/erpnext/config/buying.py,Request for quotation.,בקשה לציטוט.
 DocType: Item Default,Default Expense Account,חשבון הוצאות ברירת המחדל
@@ -575,7 +566,7 @@ DocType: Lead,Next Contact By,לתקשר בא על ידי
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},אנא בחר BOM עבור פריט בטור {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Accumulated Monthly,מצטבר חודשי
-apps/erpnext/erpnext/config/accounting.py,Accounting journal entries.,כתב עת חשבונאות ערכים.
+apps/erpnext/erpnext/config/accounts.py,Accounting journal entries.,כתב עת חשבונאות ערכים.
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** בחתך חודשי ** עוזר לך להפיץ את התקציב / היעד ברחבי חודשים אם יש לך עונתיות בעסק שלך.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Exchange Rate must be same as {0} {1} ({2}),שער החליפין חייב להיות זהה {0} {1} ({2})
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set Depreciation related Accounts in Asset Category {0} or Company {1},אנא להגדיר חשבונות הקשורים פחת קטגוריה Asset {0} או החברה {1}
@@ -599,7 +590,6 @@ apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_re
 apps/erpnext/erpnext/config/help.py,Setting up Employees,הגדרת עובדים
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
-apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
 apps/erpnext/erpnext/utilities/activation.py,Create Quotation,צור הצעת מחיר
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Closing (Dr),"סגירה (ד""ר)"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Currency is required for Price List {0},מטבע נדרש למחיר המחירון {0}
@@ -615,7 +605,6 @@ apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Balance Value,
 DocType: Lead,Interested,מעוניין
 DocType: Leave Ledger Entry,Is Leave Without Pay,האם חופשה ללא תשלום
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},סטודנט {0} - {1} מופיע מספר פעמים ברציפות {2} ו {3}
-DocType: Email Campaign,Scheduled,מתוכנן
 DocType: Tally Migration,UOMs,UOMs
 DocType: Production Plan,For Warehouse,למחסן
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js,You have entered duplicate items. Please rectify and try again.,אתה נכנס פריטים כפולים. אנא לתקן ונסה שוב.
@@ -663,7 +652,6 @@ DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ספק בד
 DocType: Share Balance,Issued,הפיק
 ,Sales Partners Commission,ועדת שותפי מכירות
 DocType: Purchase Receipt,Range,טווח
-apps/erpnext/erpnext/utilities/user_progress.py,Kg,קילוגרם
 DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please select a csv file,אנא בחר קובץ CSV
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
@@ -681,7 +669,7 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Stock Opt
 DocType: HR Settings,Include holidays in Total no. of Working Days,כולל חגים בסך הכל לא. ימי עבודה
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Account Type for {0} must be {1},סוג חשבון עבור {0} חייב להיות {1}
 DocType: Employee,Date Of Retirement,מועד הפרישה
-apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,תשלומי התאמה עם חשבוניות
+apps/erpnext/erpnext/config/accounts.py,Match Payments with Invoices,תשלומי התאמה עם חשבוניות
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Cannot enroll more than {0} students for this student group.,לא יכול לרשום יותר מ {0} סטודנטים עבור קבוצת סטודנטים זה.
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 ,Purchase Order Trends,לרכוש מגמות להזמין
@@ -693,7 +681,7 @@ DocType: Lead,Do Not Contact,אל תצור קשר
 DocType: BOM,Manage cost of operations,ניהול עלות של פעולות
 DocType: BOM Explosion Item,Qty Consumed Per Unit,כמות נצרכת ליחידה
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Software Developer,מפתח תוכנה
-apps/erpnext/erpnext/config/buying.py,Terms and Conditions Template,תבנית תנאים והגבלות
+apps/erpnext/erpnext/config/accounts.py,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Item Group,Item Group Name,שם קבוצת פריט
 ,Purchase Analytics,Analytics רכישה
 ,Employee Leave Balance,עובד חופשת מאזן
@@ -708,7 +696,7 @@ DocType: Journal Entry,Bill Date,תאריך ביל
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Transfer Material,העברת חומר
 DocType: Cheque Print Template,Payer Settings,גדרות משלמות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
-DocType: Campaign Email Schedule,CRM,CRM
+DocType: Appointment,CRM,CRM
 DocType: Tax Rule,Shipping State,מדינת משלוח
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,משכורת שנתית
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Billed,{0}% שחויבו
@@ -747,12 +735,10 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Research,
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,מתכלה
 DocType: Account,Profit and Loss,רווח והפסד
 DocType: Purchase Invoice Item,Rate,שיעור
-apps/erpnext/erpnext/utilities/user_progress.py,Meter,מטר
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
 DocType: Upload Attendance,Upload HTML,ההעלאה HTML
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js,'To Case No.' cannot be less than 'From Case No.',"""למקרה מס ' לא יכול להיות פחות מ 'מתיק מס' '"
-apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py,Please select weekly off day,אנא בחר יום מנוחה שבועי
 apps/erpnext/erpnext/public/js/utils/party.js,Please enter {0} first,נא להזין את {0} הראשון
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,לשמור על שיעור זהה לכל אורך מחזור מכירות
@@ -817,7 +803,7 @@ apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},אינך רשאים לעדכן את עסקות מניות יותר מאשר {0}
 DocType: Loyalty Program,Customer Group,קבוצת לקוחות
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Active Leads / Customers,לידים פעילים / לקוחות
-apps/erpnext/erpnext/config/accounting.py,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
+apps/erpnext/erpnext/config/accounts.py,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
 DocType: Company,Exchange Gain / Loss Account,Exchange רווח / והפסד
 apps/erpnext/erpnext/controllers/accounts_controller.py,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
@@ -996,7 +982,6 @@ DocType: POS Profile,Campaign,קמפיין
 apps/erpnext/erpnext/config/manufacturing.py,Bill of Materials (BOM),הצעת החוק של חומרים (BOM)
 DocType: Shipping Rule Country,Shipping Rule Country,מדינה כלל משלוח
 DocType: Leave Block List Date,Block Date,תאריך בלוק
-apps/erpnext/erpnext/utilities/user_progress.py,Litre,לִיטר
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
 DocType: Material Request Plan Item,Material Issue,נושא מהותי
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 1,טווח הזדקנות 1
@@ -1043,7 +1028,7 @@ DocType: Request for Quotation Item,Project Name,שם פרויקט
 DocType: Item,Will also apply for variants unless overrridden,תחול גם לגרסות אלא אם overrridden
 DocType: Account,Payable,משתלם
 DocType: Purchase Invoice,Is Paid,שולם
-apps/erpnext/erpnext/config/accounting.py,Tax Rule for transactions.,כלל מס לעסקות.
+apps/erpnext/erpnext/config/accounts.py,Tax Rule for transactions.,כלל מס לעסקות.
 DocType: Student Attendance,Present,הווה
 DocType: Production Plan Item,Planned Start Date,תאריך התחלה מתוכנן
 apps/erpnext/erpnext/config/settings.py,Create rules to restrict transactions based on values.,יצירת כללים להגבלת עסקות המבוססות על ערכים.
@@ -1068,7 +1053,7 @@ DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: Employee,Emergency Contact,צור קשר עם חירום
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,תקציבי סט פריט קבוצה חכמה על טריטוריה זו. אתה יכול לכלול גם עונתיות על ידי הגדרת ההפצה.
 DocType: Packing Slip,To Package No.,חבילת מס '
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js,Production Item,פריט ייצור
+DocType: Job Card,Production Item,פריט ייצור
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Issue Material,חומר נושא
 DocType: BOM,Routing,ניתוב
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
@@ -1098,7 +1083,6 @@ DocType: GL Entry,Debit Amount,סכום חיוב
 DocType: Subscription,Taxes,מסים
 apps/erpnext/erpnext/hooks.py,Request for Quotations,בקשת ציטטות
 apps/erpnext/erpnext/setup/doctype/territory/territory.js,This is a root territory and cannot be edited.,זהו שטח שורש ולא ניתן לערוך.
-apps/erpnext/erpnext/projects/doctype/task/task.py,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
 DocType: Packed Item,Parent Detail docname,docname פרט הורה
 apps/erpnext/erpnext/accounts/party.py,{0} {1} is frozen,{0} {1} הוא קפוא
 DocType: Item Default,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
@@ -1177,7 +1161,6 @@ apps/erpnext/erpnext/accounts/page/pos/pos.js,Price List not found or disabled,
 ,Supplier-Wise Sales Analytics,ספק-Wise Analytics המכירות
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} is cancelled or stopped,{0} {1} יבוטל או הפסיק
 DocType: Purchase Invoice Item,Discount on Price List Rate (%),הנחה על מחיר מחירון שיעור (%)
-apps/erpnext/erpnext/utilities/user_progress.py,Your Suppliers,הספקים שלך
 DocType: Journal Entry,Opening Entry,כניסת פתיחה
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js,Please select Party Type first,אנא בחר מפלגה סוג ראשון
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","כאן אתה יכול לשמור על גובה, משקל, אלרגיות, בעיות רפואיות וכו '"
@@ -1188,7 +1171,6 @@ apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py,New Customers,לקוחות חדשים
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Receipt document must be submitted,מסמך הקבלה יוגש
 DocType: Sales Invoice,Terms and Conditions Details,פרטי תנאים והגבלות
-apps/erpnext/erpnext/utilities/user_progress.py,People who teach at your organisation,אנשים המלמדים בארגון שלך
 DocType: Program Enrollment Tool,New Academic Year,חדש שנה אקדמית
 apps/erpnext/erpnext/templates/pages/projects.js,Show open,הצג פתוח
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,Sales Price List,מחיר מחירון מכירות
@@ -1274,7 +1256,7 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Ad
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Supplier(s),ספק (ים)
 DocType: Job Offer,Printing Details,הדפסת פרטים
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Clearance Date not mentioned,תאריך חיסול לא הוזכר
-apps/erpnext/erpnext/utilities/user_progress_utils.py,Local,מקומי
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Local,מקומי
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Item {0} is not a serialized Item,פריט {0} הוא לא פריט בהמשכים
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,מזהה אימייל סטודנטים
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
@@ -1306,11 +1288,10 @@ DocType: Naming Series,Prefix,קידומת
 DocType: Sales Order,Fully Billed,שחויב במלואו
 DocType: Production Plan Item,material_request_item,material_request_item
 DocType: Purchase Invoice,Unpaid,שלא שולם
-apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,גדר תקציב עבור שנת כספים.
+apps/erpnext/erpnext/config/accounts.py,Define budget for a financial year.,גדר תקציב עבור שנת כספים.
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Item Attribute,Attribute Name,שם תכונה
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
 apps/erpnext/erpnext/stock/utils.py,Item {0} ignored since it is not a stock item,פריט {0} התעלם כן הוא לא פריט מניות
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,נא לציין את מטבע בחברה
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py,Total Achieved,"סה""כ הושג"
@@ -1343,16 +1324,16 @@ DocType: Bank Transaction,Series,סדרה
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
 DocType: Stock Entry,As per Stock UOM,"לפי יח""מ מלאי"
 DocType: Naming Series,Update Series,סדרת עדכון
+apps/erpnext/erpnext/accounts/general_ledger.py,Make Journal Entry,הפוך יומן
 DocType: Work Order,Required Items,פריטים דרושים
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Name,שם דוק
-apps/erpnext/erpnext/config/accounting.py,Banking and Payments,בנקאות תשלומים
+apps/erpnext/erpnext/config/accounts.py,Banking and Payments,בנקאות תשלומים
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","לדוגמא:. ABCD ##### אם הסדרה מוגדרת ומספר סידורי אינו מוזכר בעסקות, מספר סידורי ולאחר מכן אוטומטי ייווצר מבוסס על סדרה זו. אם אתה תמיד רוצה להזכיר במפורש מס 'סידורי לפריט זה. להשאיר ריק זה."
 DocType: Maintenance Schedule,Schedules,לוחות זמנים
 DocType: BOM Item,BOM Item,פריט BOM
 DocType: Shipping Rule,example: Next Day Shipping,דוגמא: משלוח היום הבא
 DocType: Account,Stock Adjustment,התאמת מלאי
-apps/erpnext/erpnext/assets/doctype/asset/asset.js,Transfer Asset,Asset Transfer
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,אין שום דבר כדי לערוך.
 DocType: Authorization Rule,Approving Role (above authorized value),אישור תפקיד (מעל הערך מורשה)
 DocType: Manufacturing Settings,Allow Overtime,לאפשר שעות נוספות
@@ -1396,7 +1377,6 @@ For Example: If you are selling Laptops and Backpacks separately and have a spec
 Note: BOM = Bill of Materials","קבוצה כוללת של פריטים ** ** לעוד פריט ** **. זה שימושי אם אתה אורז פריטים ** ** מסוימים לתוך חבילה ואתה לשמור על מלאי של פריטים ארוזים ** ** ולא מצטבר ** ** הפריט. החבילה ** ** פריט יהיה "האם פריט במלאי" כמו "לא" ו- "האם פריט מכירות" כעל "כן". לדוגמא: אם אתה מוכר מחשבים ניידים ותיקים בנפרד ויש לי מחיר מיוחד אם הלקוח קונה את שניהם, אז המחשב הנייד התרמיל + יהיה פריט Bundle המוצר חדש. הערה: BOM = הצעת חוק של חומרים"
 DocType: BOM Update Tool,The new BOM after replacement,BOM החדש לאחר החלפה
 DocType: Leave Control Panel,New Leaves Allocated (In Days),עלים חדשים המוקצים (בימים)
-DocType: Crop,Annual,שנתי
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Health Care,בריאות
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Apprentice,Apprentice
 apps/erpnext/erpnext/config/settings.py,Setting up Email,הגדרת דוא"ל
@@ -1432,13 +1412,13 @@ apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_vouc
 DocType: Additional Salary,Salary Slip,שכר Slip
 DocType: Salary Component,Earning,להרוויח
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Computer,מחשב
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
+apps/erpnext/erpnext/education/doctype/student/student.py,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 DocType: Work Order,Actual Start Date,תאריך התחלה בפועל
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,הון פרטי
 DocType: Employee,Date of Issue,מועד ההנפקה
 DocType: SG Creation Tool Course,SG Creation Tool Course,קורס כלי יצירת SG
 DocType: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
-apps/erpnext/erpnext/config/accounting.py,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
+apps/erpnext/erpnext/config/accounts.py,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
 DocType: Budget,Fiscal Year,שנת כספים
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
 ,Lead Details,פרטי לידים
@@ -1465,6 +1445,7 @@ apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cost Center wit
 apps/erpnext/erpnext/config/crm.py,Manage Sales Person Tree.,ניהול מכירות אדם עץ.
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-הטופס אינו ישים עבור חשבונית: {0}
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
+apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} מושבתת
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,בנקאות
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,מטרת התחזוקה בקר
 DocType: Project,Estimated Cost,מחיר משוער
@@ -1474,7 +1455,7 @@ apps/erpnext/erpnext/www/all-products/item_row.html,More Details,לפרטים נ
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Additional Salary,Salary Component,מרכיב השכר
 DocType: Cheque Print Template,Message to show,הודעה להראות
-apps/erpnext/erpnext/config/buying.py,Template of terms or contract.,תבנית של מונחים או חוזה.
+apps/erpnext/erpnext/config/accounts.py,Template of terms or contract.,תבנית של מונחים או חוזה.
 DocType: Timesheet,% Amount Billed,% סכום החיוב
 DocType: Appraisal Goal,Appraisal Goal,מטרת הערכה
 apps/erpnext/erpnext/config/help.py,Serialized Inventory,מלאי בהמשכים
@@ -1489,13 +1470,13 @@ DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
 DocType: Bank Account,Contact HTML,צור קשר עם HTML
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,לוח זמנים מסלול
-apps/erpnext/erpnext/config/accounting.py,Setup cheque dimensions for printing,ממדים בדוק את הגדרות להדפסה
+apps/erpnext/erpnext/config/accounts.py,Setup cheque dimensions for printing,ממדים בדוק את הגדרות להדפסה
 DocType: Homepage Featured Product,Homepage Featured Product,מוצרי דף בית מומלצים
 DocType: Shipping Rule Condition,Shipping Rule Condition,משלוח כלל מצב
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,[Error],[שגיאה]
 DocType: Installation Note,Installation Time,זמן התקנה
 DocType: Payment Entry,Total Allocated Amount (Company Currency),הסכום כולל שהוקצה (חברת מטבע)
-apps/erpnext/erpnext/config/accounting.py,Currency exchange rate master.,שער חליפין של מטבע שני.
+apps/erpnext/erpnext/config/accounts.py,Currency exchange rate master.,שער חליפין של מטבע שני.
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,תפקיד רשאי לקבוע קפואים חשבונות ורשומים קפואים עריכה
 apps/erpnext/erpnext/public/js/account_tree_grid.js,Opening Date and Closing Date should be within same Fiscal Year,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
@@ -1525,7 +1506,7 @@ DocType: Material Request,% Ordered,% מסודר
 DocType: Purchase Invoice Item,Net Rate (Company Currency),שיעור נטו (חברת מטבע)
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
 DocType: Authorization Rule,Customer or Item,הלקוח או פריט
-apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
+apps/erpnext/erpnext/config/accounts.py,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
 DocType: Journal Entry,Print Heading,כותרת הדפסה
 DocType: Journal Entry Account,Debit in Company Currency,חיוב בחברת מטבע
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
@@ -1635,11 +1616,10 @@ DocType: BOM,Total Cost,עלות כוללת
 DocType: Sales Invoice,Accounting Details,חשבונאות פרטים
 DocType: Item Reorder,Re-Order Qty,Re-להזמין כמות
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Can be approved by {0},יכול להיות מאושר על ידי {0}
-DocType: Bank Reconciliation,From Date,מתאריך
 DocType: Pricing Rule,Buying,קנייה
 DocType: Account,Expense,חשבון
 DocType: Work Order Operation,Actual Operation Time,בפועל מבצע זמן
-apps/erpnext/erpnext/config/accounting.py,C-Form records,רשומות C-טופס
+apps/erpnext/erpnext/config/accounts.py,C-Form records,רשומות C-טופס
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},המחסן הוא חובה עבור פריט המניה {0} בשורת {1}
 DocType: Cheque Print Template,Primary Settings,הגדרות ראשיות
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,אנא בחר {0} ראשון
@@ -1649,7 +1629,6 @@ DocType: Opportunity,Customer / Lead Name,לקוחות / שם ליד
 DocType: Purchase Taxes and Charges,Add or Deduct,להוסיף או לנכות
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},לשכפל כניסה. אנא קרא אישור כלל {0}
 apps/erpnext/erpnext/config/manufacturing.py,Where manufacturing operations are carried.,איפה פעולות ייצור מתבצעות.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js,Group By,קבוצה על ידי
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Difference Amount must be zero,סכום ההבדל חייב להיות אפס
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: BOM Update Tool,Replace,החלף
@@ -1663,7 +1642,6 @@ apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"Then Pricing
 DocType: Purchase Invoice Item,Rejected Serial No,מספר סידורי שנדחו
 DocType: Packing Slip,Net Weight UOM,Net משקל של אוני 'מישגן
 DocType: Student,Nationality,לאום
-apps/erpnext/erpnext/utilities/user_progress.py,Gram,גְרַם
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
 apps/erpnext/erpnext/controllers/buying_controller.py,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
@@ -1745,7 +1723,6 @@ DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת לידי
 DocType: Rename Tool,Utilities,Utilities
 DocType: Item,Inventory,מלאי
 ,Sales Order Trends,מגמות להזמין מכירות
-DocType: Production Plan,Download Materials Required,הורד חומרים הנדרש
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},אנא הגדר {0}
 DocType: Buying Settings,Buying Settings,הגדרות קנייה
@@ -1759,7 +1736,7 @@ DocType: Stock Ledger Entry,Stock Ledger Entry,מניית דג'ר כניסה
 DocType: Payment Entry,Paid Amount,סכום ששולם
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,Jobs,מקומות תעסוקה
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,פעילויות ממתינות ל
 ,Sales Browser,דפדפן מכירות
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM {0} must be active,BOM {0} חייב להיות פעיל
@@ -1821,7 +1798,7 @@ apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_ac
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Supplier must be debit,שורת {0}: מראש נגד ספק יש לחייב
 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: Mode of Payment,General,כללי
-DocType: Contract,HR Manager,מנהל משאבי אנוש
+DocType: Appointment Booking Settings,HR Manager,מנהל משאבי אנוש
 DocType: Company,Company Info,מידע על חברה
 DocType: Supplier Quotation,Is Subcontracted,האם קבלן
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
@@ -1925,7 +1902,6 @@ apps/erpnext/erpnext/controllers/trends.py,Total(Qty),"סה""כ (כמות)"
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js,View Leads,צפייה בלידים
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Ordered Qty: Quantity ordered for purchase, but not received.","כמות הורה: כמות הורה לרכישה, אך לא קיבלה."
 DocType: Student Attendance Tool,Students HTML,HTML סטודנטים
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
 DocType: Sales Invoice Timesheet,Time Sheet,לוח זמנים
 DocType: Sales Invoice,Is Opening Entry,האם פתיחת כניסה
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Dispatch,שדר
@@ -2013,8 +1989,8 @@ DocType: Stock Entry,Repack,לארוז מחדש
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,אתה לא יכול למחוק את שנת הכספים {0}. שנת הכספים {0} מוגדרת כברירת מחדל ב הגדרות גלובליות
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/config/projects.py,Time Tracking,מעקב זמן
-DocType: BOM,Inspection Required,בדיקה הנדרשת
-apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,חשבונות Gateway התקנה.
+DocType: Stock Entry,Inspection Required,בדיקה הנדרשת
+apps/erpnext/erpnext/config/accounts.py,Setup Gateway accounts.,חשבונות Gateway התקנה.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
 DocType: Purchase Invoice,Disable Rounded Total,"להשבית מעוגל סה""כ"
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2039,11 +2015,10 @@ DocType: Item Default,Default Buying Cost Center,מרכז עלות רכישת ב
 ,Bank Clearance Summary,סיכום עמילות בנק
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html,Total Paid Amount,"סכום ששולם סה""כ"
 DocType: Bank Reconciliation Detail,Cheque Date,תאריך המחאה
-DocType: Project,Customer Details,פרטי לקוחות
+DocType: Appointment,Customer Details,פרטי לקוחות
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} יחידות של {1} צורך {2} על {3} {4} עבור {5} כדי להשלים את העסקה הזו.
 DocType: Salary Detail,Default Amount,סכום ברירת מחדל
-apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
 DocType: Sales Order,Billing Status,סטטוס חיוב
 DocType: Patient Appointment,More Info,מידע נוסף
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
@@ -2236,12 +2211,10 @@ apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: POS Profile,Write Off Cost Center,לכתוב את מרכז עלות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset scrapped via Journal Entry {0},נכסים לגרוטאות באמצעות תנועת יומן {0}
 DocType: Sales Invoice,Customer's Purchase Order,הלקוח הזמנת הרכש
 DocType: Pick List Item,Serial No and Batch,אין ו אצווה סידורי
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
-apps/erpnext/erpnext/utilities/user_progress.py,Example: Basic Mathematics,דוגמה: מתמטיקה בסיסית
 DocType: Budget,Budget,תקציב
 DocType: Warehouse,Warehouse Name,שם מחסן
 DocType: HR Settings,HR Settings,הגדרות HR
@@ -2272,7 +2245,7 @@ DocType: Sales Invoice,Sales Taxes and Charges,מסים מכירות וחיוב
 DocType: Lead,Organization Name,שם ארגון
 DocType: SMS Center,All Customer Contact,כל קשרי הלקוחות
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,"Request for Quotation is disabled to access from portal, for more check portal settings.","בקשה להצעת מחיר מושבת לגשת מתוך הפורטל, עבור הגדרות פורטל הצ'ק יותר."
-DocType: Cashier Closing,From Time,מזמן
+DocType: Appointment Booking Slots,From Time,מזמן
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Stock Expenses,הוצאות המניה
 DocType: Program,Program Name,שם התכנית
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
@@ -2289,7 +2262,7 @@ apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Write Off Amoun
 apps/erpnext/erpnext/accounts/doctype/account/account.py,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Miscellaneous Expenses,הוצאות שונות
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
-apps/erpnext/erpnext/config/accounting.py,Tree of financial accounts.,עץ חשבונות כספיים.
+apps/erpnext/erpnext/config/accounts.py,Tree of financial accounts.,עץ חשבונות כספיים.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please set 'Apply Additional Discount On',אנא הגדר 'החל הנחה נוספות ב'
@@ -2315,7 +2288,6 @@ DocType: Patient,Divorced,גרוש
 DocType: Supplier,Supplier Type,סוג ספק
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
-apps/erpnext/erpnext/utilities/user_progress.py,Pair,זוג
 DocType: Student,B-,B-
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Venture Capital,הון סיכון
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},שורת {0}: סכום שהוקצה {1} חייב להיות קטן או שווה לסכום קליט הוצאות {2}
@@ -2324,7 +2296,7 @@ DocType: Journal Entry,Bank Entry,בנק כניסה
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום חשבונית מצטיין {2}
 apps/erpnext/erpnext/templates/pages/task_info.html,On,ב
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
-apps/erpnext/erpnext/config/accounting.py,Tax template for selling transactions.,תבנית מס לעסקות מכירה.
+apps/erpnext/erpnext/config/accounts.py,Tax template for selling transactions.,תבנית מס לעסקות מכירה.
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,שורה {0}: שעות הערך חייב להיות גדול מאפס.
 DocType: POS Profile,Taxes and Charges,מסים והיטלים ש
 DocType: Program Enrollment Tool Student,Student Batch Name,שם תצווה סטודנטים
@@ -2336,7 +2308,6 @@ DocType: Leave Type,Include holidays within leaves as leaves,כולל חגים
 DocType: Student Attendance,Student Attendance,נוכחות תלמידים
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Authorization Rule,Authorized Value,ערך מורשה
-apps/erpnext/erpnext/utilities/user_progress.py,Classrooms/ Laboratories etc where lectures can be scheduled.,כיתות / מעבדות וכו שבו הרצאות ניתן לתזמן.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Entertainment Expenses,הוצאות בידור
 DocType: Expense Claim,Expenses,הוצאות
 DocType: Purchase Invoice Item,Purchase Invoice Item,לרכוש פריט החשבונית
@@ -2358,7 +2329,6 @@ DocType: Employee Attendance Tool,Employees HTML,עובד HTML
 DocType: Sales Order,Delivery Date,תאריך משלוח
 apps/erpnext/erpnext/stock/doctype/item/item.js,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),"סה""כ מסים וחיובים (מטבע חברה)"
-DocType: Bank Reconciliation,To Date,לתאריך
 DocType: Work Order Operation,Estimated Time and Cost,זמן ועלות משוערים
 DocType: Purchase Invoice Item,Amount (Company Currency),הסכום (חברת מטבע)
 DocType: Naming Series,Select Transaction,עסקה בחר
@@ -2415,7 +2385,6 @@ DocType: Purchase Invoice Item,Landed Cost Voucher Amount,הסכום שובר ע
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js,Create Student Groups,יצירת קבוצות סטודנטים
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,{0} does not belong to Company {1},{0} אינו שייך לחברת {1}
 DocType: Task,Working,עבודה
-apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html,Statement of Account,הצהרה של חשבון
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,במילים יהיו גלוי לאחר שתשמרו את תעודת המשלוח.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Make ,הפוך
@@ -2427,7 +2396,6 @@ DocType: Delivery Note Item,From Warehouse,ממחסן
 apps/erpnext/erpnext/accounts/utils.py,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,ביטחון
 DocType: Bank Account,Party Details,מפלגת פרטים
-apps/erpnext/erpnext/utilities/user_progress.py,Example: Masters in Computer Science,דוגמה: שני במדעי המחשב
 apps/erpnext/erpnext/setup/doctype/company/company.js,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
 apps/erpnext/erpnext/config/selling.py,Customer Addresses And Contacts,כתובות של לקוחות ואנשי קשר
 DocType: BOM Item,Basic Rate (Company Currency),שיעור בסיסי (חברת מטבע)
@@ -2455,7 +2423,6 @@ apps/erpnext/erpnext/config/settings.py,Data Import and Export,נתוני יבו
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Credit Account,חשבון אשראי
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
 DocType: Leave Application,Follow via Email,"עקוב באמצעות דוא""ל"
-apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
 DocType: Asset,Depreciation Method,שיטת הפחת
 DocType: Purchase Invoice,Supplied Items,פריטים שסופקו
 DocType: Task Depends On,Task Depends On,המשימה תלויה ב
@@ -2511,7 +2478,7 @@ DocType: Cheque Print Template,Signatory Position,תפקיד החותם
 ,Item-wise Sales Register,פריט חכם מכירות הרשמה
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Pricing Rule,Margin,Margin
-DocType: Work Order,Qty To Manufacture,כמות לייצור
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Qty To Manufacture,כמות לייצור
 DocType: Bank Statement Transaction Settings Item,Transaction,עסקה
 apps/erpnext/erpnext/public/js/setup_wizard.js,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
 DocType: Email Digest,Email Digest Settings,"הגדרות Digest דוא""ל"
@@ -2558,7 +2525,6 @@ apps/erpnext/erpnext/public/js/setup_wizard.js,Institute Abbreviation,קיצור
 DocType: Course Scheduling Tool,Course End Date,תאריך סיום קורס
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
 DocType: Monthly Distribution,Monthly Distribution Percentages,אחוזים בחתך חודשיים
-apps/erpnext/erpnext/projects/doctype/task/task.py,'Expected Start Date' can not be greater than 'Expected End Date',"'תאריך ההתחלה צפויה ""לא יכול להיות יותר מאשר' תאריך סיום צפוי  'גדול יותר"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,אנא הגדר שדה זיהוי משתמש בשיא לעובדים להגדיר תפקיד העובד
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
 DocType: Appraisal Template Goal,Appraisal Template Goal,מטרת הערכת תבנית
@@ -2601,7 +2567,7 @@ apps/erpnext/erpnext/config/manufacturing.py,BOM Browser,דפדפן BOM
 apps/erpnext/erpnext/stock/reorder_item.py,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Reserved for manufacturing,שמורות לייצור
 DocType: Bank,Bank Name,שם בנק
-apps/erpnext/erpnext/config/buying.py,Supplier database.,מסד נתוני ספק.
+apps/erpnext/erpnext/config/accounts.py,Supplier database.,מסד נתוני ספק.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Credit Card,כרטיס אשראי
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,שלח הודעות דוא"ל ספק
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
@@ -2682,7 +2648,7 @@ DocType: Account,Accounts,חשבונות
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,הזדמנויות
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,בעקבות בקשות חומר הועלה באופן אוטומטי המבוסס על הרמה מחדש כדי של הפריט
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js,Create Print Format,יצירת תבנית הדפסה
-apps/erpnext/erpnext/config/accounting.py,Update Bank Transaction Dates,תאריכי עסקת בנק Update
+apps/erpnext/erpnext/config/accounts.py,Update Bank Transaction Dates,תאריכי עסקת בנק Update
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,פריט איכות פיקוח פרמטר
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Duplicate entry,כניסה כפולה
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(שעת דרג / 60) * בפועל מבצע זמן
@@ -2693,8 +2659,8 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Debit Accou
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
 ,To Produce,כדי לייצר
 DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
-apps/erpnext/erpnext/config/manufacturing.py,Production,הפקה
-DocType: Daily Work Summary Group,Holiday List,רשימת החג
+DocType: Job Card,Production,הפקה
+DocType: Appointment Booking Settings,Holiday List,רשימת החג
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
 apps/erpnext/erpnext/public/js/setup_wizard.js,The name of the institute for which you are setting up this system.,שמו של המכון אשר אתה מגדיר מערכת זו.
 DocType: C-Form,Received Date,תאריך קבלה
@@ -2719,7 +2685,6 @@ DocType: Sales Invoice Item,Customer's Item Code,קוד הפריט של הלקו
 DocType: Opening Invoice Creation Tool,Purchase,רכישה
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),סכום הנחה נוסף (מטבע חברה)
-apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
 DocType: Customer,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
@@ -2766,7 +2731,7 @@ DocType: Bank Statement Transaction Invoice Item,Sales Invoice,חשבונית מ
 DocType: Email Digest,Add Quote,להוסיף ציטוט
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
-DocType: Asset,Asset Category,קטגורית נכסים
+DocType: Purchase Invoice Item,Asset Category,קטגורית נכסים
 DocType: Item,Will also apply for variants,תחול גם לגרסות
 DocType: Work Order Operation,In minutes,בדקות
 DocType: Item,Moving Average,ממוצע נע
@@ -2789,7 +2754,7 @@ DocType: Lead,Person Name,שם אדם
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Dividends Paid,דיבידנדים ששולם
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Stock Liabilities,התחייבויות מניות
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
+apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.py,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Company,Budget Detail,פרטי תקציב
 apps/erpnext/erpnext/public/js/setup_wizard.js,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
@@ -2854,11 +2819,10 @@ DocType: Purchase Invoice,Tax ID,זיהוי מס
 DocType: Item Reorder,Request for,בקשה ל
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Get items from,קבל פריטים מ
 apps/erpnext/erpnext/controllers/item_variant.py,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} וזאת במדרגות של {3} עבור פריט {4}
-DocType: Timesheet Detail,Operation ID,מבצע זיהוי
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Operation ID,מבצע זיהוי
 DocType: Project,Gross Margin,שיעור רווח גולמי
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
-DocType: Purchase Invoice Item,PR Detail,פרט יחסי הציבור
 DocType: Budget,Cost Center,מרכז עלות
 DocType: Naming Series,This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
 DocType: Purchase Invoice Item,Quantity and Rate,כמות ושיעור
@@ -2882,7 +2846,7 @@ DocType: Packing Slip,Gross Weight,משקל ברוטו
 apps/erpnext/erpnext/accounts/general_ledger.py,Please mention Round Off Account in Company,נא לציין לעגל חשבון בחברה
 DocType: Payment Gateway Account,Default Payment Request Message,הודעת בקשת תשלום ברירת מחדל
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} has been disabled,פריט {0} הושבה
-apps/erpnext/erpnext/config/accounting.py,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
+apps/erpnext/erpnext/config/accounts.py,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
 DocType: Customer,Sales Partner and Commission,פרטנר מכירות והוועדה
 apps/erpnext/erpnext/config/help.py,Opening Stock Balance,יתרת מלאי פתיחה
 apps/erpnext/erpnext/accounts/utils.py,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
@@ -2947,7 +2911,7 @@ apps/erpnext/erpnext/accounts/doctype/account/account.py,"Merging is only possib
 DocType: BOM,Operations,פעולות
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,{0}: From {0} of type {1},{0}: החל מ- {0} מסוג {1}
-apps/erpnext/erpnext/config/accounting.py,Bills raised by Suppliers.,הצעות חוק שהועלה על ידי ספקים.
+apps/erpnext/erpnext/config/accounts.py,Bills raised by Suppliers.,הצעות חוק שהועלה על ידי ספקים.
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 apps/erpnext/erpnext/stock/doctype/item/item.py,Stores,חנויות
@@ -3021,10 +2985,10 @@ DocType: Program Enrollment,Transportation,תחבורה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py,Cost of Delivered Items,עלות פריטים נמסר
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Motion Picture & Video,Motion Picture ווידאו
 DocType: SMS Log,Requested Numbers,מספרים מבוקשים
-DocType: Lead,Address Desc,כתובת יורד
+DocType: Sales Partner,Address Desc,כתובת יורד
 DocType: Bank Account,Account Details,פרטי חשבון
 DocType: Employee Benefit Application,Employee Benefits,הטבות לעובדים
-apps/erpnext/erpnext/config/accounting.py,Bank/Cash transactions against party or for internal transfer,עסקות בנק / מזומנים נגד מפלגה או עבור העברה פנימית
+apps/erpnext/erpnext/config/accounts.py,Bank/Cash transactions against party or for internal transfer,עסקות בנק / מזומנים נגד מפלגה או עבור העברה פנימית
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},עלים שהוקצו בהצלחה עבור {0}
 DocType: BOM,Materials,חומרים
 DocType: Sales Invoice Item,Qty as per Stock UOM,כמות כמו לכל בורסה של אוני 'מישגן
@@ -3039,11 +3003,10 @@ DocType: Job Card,WIP Warehouse,מחסן WIP
 DocType: Sales Invoice Item,Brand Name,שם מותג
 DocType: Serial No,Delivery Document Type,סוג מסמך משלוח
 DocType: Workstation,Wages per hour,שכר לשעה
-apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,המוצרים או השירותים שלך
 DocType: Purchase Invoice,Items,פריטים
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py,Material,חוֹמֶר
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial No {0} does not belong to Item {1},מספר סידורי {0} אינו שייך לפריט {1}
-apps/erpnext/erpnext/config/accounting.py,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
+apps/erpnext/erpnext/config/accounts.py,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
 apps/erpnext/erpnext/accounts/general_ledger.py,Account: {0} can only be updated via Stock Transactions,חשבון: {0} ניתן לעדכן רק דרך עסקות במלאי
 DocType: BOM,Item to be manufactured or repacked,פריט שמיוצר או ארזה
 DocType: Purchase Taxes and Charges,On Previous Row Amount,על סכום שורה הקודם
@@ -3085,7 +3048,7 @@ DocType: Purchase Invoice Item,Received Qty,כמות התקבלה
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Intern,Intern
 DocType: Employee Attendance Tool,Employee Attendance Tool,כלי נוכחות עובדים
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
-DocType: Asset Movement,From Employee,מעובדים
+DocType: Asset Movement Item,From Employee,מעובדים
 DocType: Department,Days for which Holidays are blocked for this department.,ימים בי החגים חסומים למחלקה זו.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה "חומרי גלם מסופקת 'בהזמנת רכש {1}
 DocType: Workstation,Wages,שכר
@@ -3104,7 +3067,7 @@ apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 1,פריט 1
 DocType: Price List Country,Price List Country,מחיר מחירון מדינה
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,להזמין מכירות לתשלום
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
-apps/erpnext/erpnext/config/accounting.py,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
+apps/erpnext/erpnext/config/accounts.py,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Homepage,Products to be shown on website homepage,מוצרים שיוצגו על בית של אתר
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Biotechnology,ביוטכנולוגיה
@@ -3140,7 +3103,7 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,התעו
 DocType: Lead,Industry,תעשייה
 DocType: Asset,Partially Depreciated,חלקי מופחת
 DocType: Asset,Straight Line,קו ישר
-apps/erpnext/erpnext/controllers/accounts_controller.py,'Update Stock' cannot be checked for fixed asset sale,'עדכון מאגר' לא ניתן לבדוק למכירת נכס קבועה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,'Update Stock' cannot be checked for fixed asset sale,'עדכון מאגר' לא ניתן לבדוק למכירת נכס קבועה
 DocType: Item Reorder,Re-Order Level,סדר מחדש רמה
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Error: Not a valid id?,שגיאה: לא מזהה בתוקף?
 DocType: Sales Invoice,Vehicle No,רכב לא
@@ -3262,7 +3225,7 @@ DocType: Lead,Market Segment,פלח שוק
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,לשמור על אותו קצב לאורך כל מחזור הרכישה
 apps/erpnext/erpnext/stock/doctype/item/item.py,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 DocType: Issue,First Responded On,הגיב בראשון
-apps/erpnext/erpnext/config/crm.py,Customer database.,מאגר מידע על לקוחות.
+apps/erpnext/erpnext/config/accounts.py,Customer database.,מאגר מידע על לקוחות.
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
@@ -3281,7 +3244,6 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a Fixed Asse
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py,Billed Amount,סכום חיוב
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Consumer Products,מוצרים צריכה
-apps/erpnext/erpnext/utilities/user_progress.py,Box,תיבה
 DocType: Accounts Settings,Billing Address,כתובת לחיוב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,תוספת לא יכולה להיות 0
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
@@ -3306,9 +3268,9 @@ DocType: Employee,Resignation Letter Date,תאריך מכתב התפטרות
 apps/erpnext/erpnext/stock/doctype/item/item.py,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 DocType: Employee,Offer Date,תאריך הצעה
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
-apps/erpnext/erpnext/utilities/user_progress_utils.py,Commercial,מסחרי
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Commercial,מסחרי
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery Note,תעודת משלוח
-apps/erpnext/erpnext/config/accounting.py,Financial / accounting year.,כספי לשנה / חשבונאות.
+apps/erpnext/erpnext/config/accounts.py,Financial / accounting year.,כספי לשנה / חשבונאות.
 DocType: Material Request,Requested For,ביקש ל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Set Tax Rule for shopping cart,כלל מס שנקבע לעגלת קניות
@@ -3379,7 +3341,7 @@ apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change F
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,הזמנה חוזרת רמה
 DocType: SG Creation Tool Course,Student Group Name,שם סטודנט הקבוצה
 DocType: Accounts Settings,Credit Controller,בקר אשראי
-apps/erpnext/erpnext/config/buying.py,Tax template for buying transactions.,תבנית מס בעסקות קנייה.
+apps/erpnext/erpnext/config/accounts.py,Tax template for buying transactions.,תבנית מס בעסקות קנייה.
 apps/erpnext/erpnext/projects/doctype/task/task.js,Timesheet,לוח זמנים
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 apps/erpnext/erpnext/stock/doctype/item/item.js,Balance,מאזן