Merge branch 'develop' into stock-reservation

erpnext/accounts/doctype/account/account.py

@@ -204,8 +204,11 @@ class Account(NestedSet):
 				)
 
 	def validate_account_currency(self):
+		self.currency_explicitly_specified = True
+
 		if not self.account_currency:
 			self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
+			self.currency_explicitly_specified = False
 
 		gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")
 
@@ -251,8 +254,10 @@ class Account(NestedSet):
 					{
 						"company": company,
 						# parent account's currency should be passed down to child account's curreny
-						# if it is None, it picks it up from default company currency, which might be unintended
-						"account_currency": erpnext.get_company_currency(company),
+						# if currency explicitly specified by user, child will inherit. else, default currency will be used.
+						"account_currency": self.account_currency
+						if self.currency_explicitly_specified
+						else erpnext.get_company_currency(company),
 						"parent_account": parent_acc_name_map[company],
 					}
 				)

erpnext/accounts/doctype/account/test_account.py

@@ -5,10 +5,13 @@
 import unittest
 
 import frappe
+from frappe.test_runner import make_test_records
 
 from erpnext.accounts.doctype.account.account import merge_account, update_account_number
 from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
 
+test_dependencies = ["Company"]
+
 
 class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
@@ -188,6 +191,58 @@ class TestAccount(unittest.TestCase):
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC4")
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC5")
 
+	def test_account_currency_sync(self):
+		"""
+		In a parent->child company setup, child should inherit parent account currency if explicitly specified.
+		"""
+
+		make_test_records("Company")
+
+		frappe.local.flags.pop("ignore_root_company_validation", None)
+
+		def create_bank_account():
+			acc = frappe.new_doc("Account")
+			acc.account_name = "_Test Bank JPY"
+
+			acc.parent_account = "Temporary Accounts - _TC6"
+			acc.company = "_Test Company 6"
+			return acc
+
+		acc = create_bank_account()
+		# Explicitly set currency
+		acc.account_currency = "JPY"
+		acc.insert()
+		self.assertTrue(
+			frappe.db.exists(
+				{
+					"doctype": "Account",
+					"account_name": "_Test Bank JPY",
+					"account_currency": "JPY",
+					"company": "_Test Company 7",
+				}
+			)
+		)
+
+		frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
+		frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
+
+		acc = create_bank_account()
+		# default currency is used
+		acc.insert()
+		self.assertTrue(
+			frappe.db.exists(
+				{
+					"doctype": "Account",
+					"account_name": "_Test Bank JPY",
+					"account_currency": "USD",
+					"company": "_Test Company 7",
+				}
+			)
+		)
+
+		frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
+		frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
+
 	def test_child_company_account_rename_sync(self):
 		frappe.local.flags.pop("ignore_root_company_validation", None)
 

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -1369,6 +1369,7 @@
    "options": "Warehouse",
    "print_hide": 1,
    "print_width": "50px",
+   "ignore_user_permissions": 1,
    "width": "50px"
   },
   {
@@ -1572,7 +1573,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-04-28 12:57:50.832598",
+ "modified": "2023-04-29 12:57:50.832598",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -1171,6 +1171,7 @@
    "depends_on": "is_internal_supplier",
    "fieldname": "set_from_warehouse",
    "fieldtype": "Link",
+   "ignore_user_permissions": 1,
    "label": "Set From Warehouse",
    "options": "Warehouse"
   },
@@ -1271,7 +1272,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-04-14 16:42:29.448464",
+ "modified": "2023-05-07 20:18:09.196799",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",

erpnext/manufacturing/doctype/job_card/job_card.py

@@ -87,6 +87,12 @@ class JobCard(Document):
 			frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty")
 		)
 
+		over_production_percentage = flt(
+			frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
+		)
+
+		wo_qty = wo_qty + (wo_qty * over_production_percentage / 100)
+
 		job_card_qty = frappe.get_all(
 			"Job Card",
 			fields=["sum(for_quantity)"],
@@ -101,8 +107,17 @@ class JobCard(Document):
 		job_card_qty = flt(job_card_qty[0][0]) if job_card_qty else 0
 
 		if job_card_qty and ((job_card_qty - completed_qty) > wo_qty):
-			msg = f"""Job Card quantity cannot be greater than
-				Work Order quantity for the operation {self.operation}"""
+			form_link = get_link_to_form("Manufacturing Settings", "Manufacturing Settings")
+
+			msg = f"""
+				Qty To Manufacture in the job card
+				cannot be greater than Qty To Manufacture in the
+				work order for the operation {bold(self.operation)}.
+				<br><br><b>Solution: </b> Either you can reduce the
+				Qty To Manufacture in the job card or set the
+				'Overproduction Percentage For Work Order'
+				in the {form_link}."""
+
 			frappe.throw(_(msg), title=_("Extra Job Card Quantity"))
 
 	def set_sub_operations(self):
@@ -547,6 +562,7 @@ class JobCard(Document):
 			)
 
 	def update_work_order_data(self, for_quantity, time_in_mins, wo):
+		workstation_hour_rate = frappe.get_value("Workstation", self.workstation, "hour_rate")
 		jc = frappe.qb.DocType("Job Card")
 		jctl = frappe.qb.DocType("Job Card Time Log")
 
@@ -572,6 +588,7 @@ class JobCard(Document):
 				if data.get("workstation") != self.workstation:
 					# workstations can change in a job card
 					data.workstation = self.workstation
+					data.hour_rate = flt(workstation_hour_rate)
 
 		wo.flags.ignore_validate_update_after_submit = True
 		wo.update_operation_status()

erpnext/manufacturing/doctype/job_card/test_job_card.py

@@ -272,6 +272,42 @@ class TestJobCard(FrappeTestCase):
 		transfer_entry_2.insert()
 		self.assertRaises(JobCardOverTransferError, transfer_entry_2.submit)
 
+	@change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
+	def test_job_card_excess_material_transfer_with_no_reference(self):
+
+		self.transfer_material_against = "Job Card"
+		self.source_warehouse = "Stores - _TC"
+
+		self.generate_required_stock(self.work_order)
+
+		job_card_name = frappe.db.get_value("Job Card", {"work_order": self.work_order.name})
+
+		# fully transfer both RMs
+		transfer_entry_1 = make_stock_entry_from_jc(job_card_name)
+		row = transfer_entry_1.items[0]
+
+		# Add new row without reference of the job card item
+		transfer_entry_1.append(
+			"items",
+			{
+				"item_code": row.item_code,
+				"item_name": row.item_name,
+				"item_group": row.item_group,
+				"qty": row.qty,
+				"uom": row.uom,
+				"conversion_factor": row.conversion_factor,
+				"stock_uom": row.stock_uom,
+				"basic_rate": row.basic_rate,
+				"basic_amount": row.basic_amount,
+				"expense_account": row.expense_account,
+				"cost_center": row.cost_center,
+				"s_warehouse": row.s_warehouse,
+				"t_warehouse": row.t_warehouse,
+			},
+		)
+
+		self.assertRaises(frappe.ValidationError, transfer_entry_1.insert)
+
 	def test_job_card_partial_material_transfer(self):
 		"Test partial material transfer against Job Card"
 		self.transfer_material_against = "Job Card"

erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json

@@ -16,6 +16,7 @@
   "column_break_4",
   "quantity",
   "uom",
+  "conversion_factor",
   "projected_qty",
   "reserved_qty_for_production",
   "safety_stock",
@@ -169,11 +170,17 @@
    "label": "Qty As Per BOM",
    "no_copy": 1,
    "read_only": 1
+  },
+  {
+   "fieldname": "conversion_factor",
+   "fieldtype": "Float",
+   "label": "Conversion Factor",
+   "read_only": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-11-26 14:59:25.879631",
+ "modified": "2023-05-03 12:43:29.895754",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Material Request Plan Item",

erpnext/manufacturing/doctype/production_plan/production_plan.js

@@ -336,10 +336,6 @@ frappe.ui.form.on('Production Plan', {
 	},
 
 	get_items_for_material_requests(frm, warehouses) {
-		let set_fields = ['actual_qty', 'item_code','item_name', 'description', 'uom', 'from_warehouse',
-			'min_order_qty', 'required_bom_qty', 'quantity', 'sales_order', 'warehouse', 'projected_qty', 'ordered_qty',
-			'reserved_qty_for_production', 'material_request_type'];
-
 		frappe.call({
 			method: "erpnext.manufacturing.doctype.production_plan.production_plan.get_items_for_material_requests",
 			freeze: true,
@@ -352,11 +348,11 @@ frappe.ui.form.on('Production Plan', {
 					frm.set_value('mr_items', []);
 					r.message.forEach(row => {
 						let d = frm.add_child('mr_items');
-						set_fields.forEach(field => {
-							if (row[field]) {
+						for (let field in row) {
+							if (field !== 'name') {
 								d[field] = row[field];
 							}
-						});
+						}
 					});
 				}
 				refresh_field('mr_items');

erpnext/manufacturing/doctype/production_plan/production_plan.py

@@ -28,6 +28,7 @@ from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
 from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
 from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
 from erpnext.stock.get_item_details import get_conversion_factor
+from erpnext.stock.utils import get_or_make_bin
 from erpnext.utilities.transaction_base import validate_uom_is_integer
 
 
@@ -398,9 +399,20 @@ class ProductionPlan(Document):
 		self.set_status()
 		self.db_set("status", self.status)
 
+	def on_submit(self):
+		self.update_bin_qty()
+
 	def on_cancel(self):
 		self.db_set("status", "Cancelled")
 		self.delete_draft_work_order()
+		self.update_bin_qty()
+
+	def update_bin_qty(self):
+		for d in self.mr_items:
+			if d.warehouse:
+				bin_name = get_or_make_bin(d.item_code, d.warehouse)
+				bin = frappe.get_doc("Bin", bin_name, for_update=True)
+				bin.update_reserved_qty_for_production_plan()
 
 	def delete_draft_work_order(self):
 		for d in frappe.get_all(
@@ -575,6 +587,7 @@ class ProductionPlan(Document):
 					"production_plan_sub_assembly_item": row.name,
 					"bom": row.bom_no,
 					"production_plan": self.name,
+					"fg_item_qty": row.qty,
 				}
 
 				for field in [
@@ -1068,6 +1081,7 @@ def get_material_request_items(
 			"item_code": row.item_code,
 			"item_name": row.item_name,
 			"quantity": required_qty / conversion_factor,
+			"conversion_factor": conversion_factor,
 			"required_bom_qty": total_qty,
 			"stock_uom": row.get("stock_uom"),
 			"warehouse": warehouse
@@ -1474,3 +1488,34 @@ def set_default_warehouses(row, default_warehouses):
 	for field in ["wip_warehouse", "fg_warehouse"]:
 		if not row.get(field):
 			row[field] = default_warehouses.get(field)
+
+
+def get_reserved_qty_for_production_plan(item_code, warehouse):
+	from erpnext.manufacturing.doctype.work_order.work_order import get_reserved_qty_for_production
+
+	table = frappe.qb.DocType("Production Plan")
+	child = frappe.qb.DocType("Material Request Plan Item")
+
+	query = (
+		frappe.qb.from_(table)
+		.inner_join(child)
+		.on(table.name == child.parent)
+		.select(Sum(child.quantity * IfNull(child.conversion_factor, 1.0)))
+		.where(
+			(table.docstatus == 1)
+			& (child.item_code == item_code)
+			& (child.warehouse == warehouse)
+			& (table.status.notin(["Completed", "Closed"]))
+		)
+	).run()
+
+	if not query:
+		return 0.0
+
+	reserved_qty_for_production_plan = flt(query[0][0])
+
+	reserved_qty_for_production = flt(
+		get_reserved_qty_for_production(item_code, warehouse, check_production_plan=True)
+	)
+
+	return reserved_qty_for_production_plan - reserved_qty_for_production

erpnext/manufacturing/doctype/production_plan/test_production_plan.py

@@ -307,6 +307,43 @@ class TestProductionPlan(FrappeTestCase):
 
 		self.assertEqual(plan.sub_assembly_items[0].supplier, "_Test Supplier")
 
+	def test_production_plan_for_subcontracting_po(self):
+		from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
+
+		bom_tree_1 = {"Test Laptop 1": {"Test Motherboard 1": {"Test Motherboard Wires 1": {}}}}
+		create_nested_bom(bom_tree_1, prefix="")
+
+		item_doc = frappe.get_doc("Item", "Test Motherboard 1")
+		company = "_Test Company"
+
+		item_doc.is_sub_contracted_item = 1
+		for row in item_doc.item_defaults:
+			if row.company == company and not row.default_supplier:
+				row.default_supplier = "_Test Supplier"
+
+		if not item_doc.item_defaults:
+			item_doc.append("item_defaults", {"company": company, "default_supplier": "_Test Supplier"})
+
+		item_doc.save()
+
+		plan = create_production_plan(
+			item_code="Test Laptop 1", planned_qty=10, use_multi_level_bom=1, do_not_submit=True
+		)
+		plan.get_sub_assembly_items()
+		plan.set_default_supplier_for_subcontracting_order()
+		plan.submit()
+
+		self.assertEqual(plan.sub_assembly_items[0].supplier, "_Test Supplier")
+		plan.make_work_order()
+
+		po = frappe.db.get_value("Purchase Order Item", {"production_plan": plan.name}, "parent")
+		po_doc = frappe.get_doc("Purchase Order", po)
+		self.assertEqual(po_doc.supplier, "_Test Supplier")
+		self.assertEqual(po_doc.items[0].qty, 10.0)
+		self.assertEqual(po_doc.items[0].fg_item_qty, 10.0)
+		self.assertEqual(po_doc.items[0].fg_item_qty, 10.0)
+		self.assertEqual(po_doc.items[0].fg_item, "Test Motherboard 1")
+
 	def test_production_plan_combine_subassembly(self):
 		"""
 		Test combining Sub assembly items belonging to the same BOM in Prod Plan.
@@ -868,6 +905,27 @@ class TestProductionPlan(FrappeTestCase):
 		for item_code in mr_items:
 			self.assertTrue(item_code in validate_mr_items)
 
+	def test_resered_qty_for_production_plan_for_material_requests(self):
+		from erpnext.stock.utils import get_or_make_bin
+
+		bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC")
+		before_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+		pln = create_production_plan(item_code="Test Production Item 1")
+
+		bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC")
+		after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+		self.assertEqual(after_qty - before_qty, 1)
+
+		pln = frappe.get_doc("Production Plan", pln.name)
+		pln.cancel()
+
+		bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC")
+		after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+		self.assertEqual(after_qty, before_qty)
+
 
 def create_production_plan(**args):
 	"""

erpnext/manufacturing/doctype/work_order/test_work_order.py

@@ -1649,6 +1649,14 @@ class TestWorkOrder(FrappeTestCase):
 		job_card2 = frappe.copy_doc(job_card_doc)
 		self.assertRaises(frappe.ValidationError, job_card2.save)
 
+		frappe.db.set_single_value(
+			"Manufacturing Settings", "overproduction_percentage_for_work_order", 100
+		)
+
+		job_card2 = frappe.copy_doc(job_card_doc)
+		job_card2.time_logs = []
+		job_card2.save()
+
 
 def prepare_data_for_workstation_type_check():
 	from erpnext.manufacturing.doctype.operation.test_operation import make_operation

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -558,12 +558,19 @@ class WorkOrder(Document):
 			and self.production_plan_item
 			and not self.production_plan_sub_assembly_item
 		):
-			qty = frappe.get_value("Production Plan Item", self.production_plan_item, "ordered_qty") or 0.0
+			table = frappe.qb.DocType("Work Order")
 
-			if self.docstatus == 1:
-				qty += self.qty
-			elif self.docstatus == 2:
-				qty -= self.qty
+			query = (
+				frappe.qb.from_(table)
+				.select(Sum(table.qty))
+				.where(
+					(table.production_plan == self.production_plan)
+					& (table.production_plan_item == self.production_plan_item)
+					& (table.docstatus == 1)
+				)
+			).run()
+
+			qty = flt(query[0][0]) if query else 0
 
 			frappe.db.set_value("Production Plan Item", self.production_plan_item, "ordered_qty", qty)
 
@@ -1476,12 +1483,14 @@ def create_pick_list(source_name, target_doc=None, for_qty=None):
 	return doc
 
 
-def get_reserved_qty_for_production(item_code: str, warehouse: str) -> float:
+def get_reserved_qty_for_production(
+	item_code: str, warehouse: str, check_production_plan: bool = False
+) -> float:
 	"""Get total reserved quantity for any item in specified warehouse"""
 	wo = frappe.qb.DocType("Work Order")
 	wo_item = frappe.qb.DocType("Work Order Item")
 
-	return (
+	query = (
 		frappe.qb.from_(wo)
 		.from_(wo_item)
 		.select(
@@ -1502,7 +1511,12 @@ def get_reserved_qty_for_production(item_code: str, warehouse: str) -> float:
 				| (wo_item.required_qty > wo_item.consumed_qty)
 			)
 		)
-	).run()[0][0] or 0.0
+	)
+
+	if check_production_plan:
+		query = query.where(wo.production_plan.isnotnull())
+
+	return query.run()[0][0] or 0.0
 
 
 @frappe.whitelist()

erpnext/selling/doctype/customer/customer.py

@@ -617,11 +617,15 @@ def get_credit_limit(customer, company):
 
 		if not credit_limit:
 			customer_group = frappe.get_cached_value("Customer", customer, "customer_group")
-			credit_limit = frappe.db.get_value(
+
+			result = frappe.db.get_values(
 				"Customer Credit Limit",
 				{"parent": customer_group, "parenttype": "Customer Group", "company": company},
-				"credit_limit",
+				fieldname=["credit_limit", "bypass_credit_limit_check"],
+				as_dict=True,
 			)
+			if result and not result[0].bypass_credit_limit_check:
+				credit_limit = result[0].credit_limit
 
 	if not credit_limit:
 		credit_limit = frappe.get_cached_value("Company", company, "credit_limit")

erpnext/selling/doctype/quotation/quotation.py

@@ -286,6 +286,18 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
 			target.commission_rate = frappe.get_value(
 				"Sales Partner", source.referral_sales_partner, "commission_rate"
 			)
+
+		# sales team
+		for d in customer.get("sales_team"):
+			target.append(
+				"sales_team",
+				{
+					"sales_person": d.sales_person,
+					"allocated_percentage": d.allocated_percentage or None,
+					"commission_rate": d.commission_rate,
+				},
+			)
+
 		target.flags.ignore_permissions = ignore_permissions
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")

erpnext/setup/doctype/company/test_records.json

@@ -80,5 +80,30 @@
 		"chart_of_accounts": "Standard",
 		"enable_perpetual_inventory": 1,
 		"default_holiday_list": "_Test Holiday List"
+	},
+	{
+		"abbr": "_TC6",
+		"company_name": "_Test Company 6",
+		"is_group": 1,
+		"country": "India",
+		"default_currency": "INR",
+		"doctype": "Company",
+		"domain": "Manufacturing",
+		"chart_of_accounts": "Standard",
+		"default_holiday_list": "_Test Holiday List",
+		"enable_perpetual_inventory": 0
+	},
+	{
+		"abbr": "_TC7",
+		"company_name": "_Test Company 7",
+		"parent_company": "_Test Company 6",
+		"is_group": 1,
+		"country": "United States",
+		"default_currency": "USD",
+		"doctype": "Company",
+		"domain": "Manufacturing",
+		"chart_of_accounts": "Standard",
+		"default_holiday_list": "_Test Holiday List",
+		"enable_perpetual_inventory": 0
 	}
 ]

erpnext/stock/doctype/bin/bin.json

@@ -15,6 +15,7 @@
   "projected_qty",
   "reserved_qty_for_production",
   "reserved_qty_for_sub_contract",
+  "reserved_qty_for_production_plan",
   "ma_rate",
   "stock_uom",
   "fcfs_rate",
@@ -165,13 +166,19 @@
    "oldfieldname": "stock_value",
    "oldfieldtype": "Currency",
    "read_only": 1
+  },
+  {
+   "fieldname": "reserved_qty_for_production_plan",
+   "fieldtype": "Float",
+   "label": "Reserved Qty for Production Plan",
+   "read_only": 1
   }
  ],
  "hide_toolbar": 1,
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2022-03-30 07:22:23.868602",
+ "modified": "2023-05-02 23:26:21.806965",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Bin",

erpnext/stock/doctype/bin/bin.py

@@ -24,8 +24,30 @@ class Bin(Document):
 			- flt(self.reserved_qty)
 			- flt(self.reserved_qty_for_production)
 			- flt(self.reserved_qty_for_sub_contract)
+			- flt(self.reserved_qty_for_production_plan)
 		)
 
+	def update_reserved_qty_for_production_plan(self, skip_project_qty_update=False):
+		"""Update qty reserved for production from Production Plan tables
+		in open production plan"""
+		from erpnext.manufacturing.doctype.production_plan.production_plan import (
+			get_reserved_qty_for_production_plan,
+		)
+
+		self.reserved_qty_for_production_plan = get_reserved_qty_for_production_plan(
+			self.item_code, self.warehouse
+		)
+
+		self.db_set(
+			"reserved_qty_for_production_plan",
+			flt(self.reserved_qty_for_production_plan),
+			update_modified=True,
+		)
+
+		if not skip_project_qty_update:
+			self.set_projected_qty()
+			self.db_set("projected_qty", self.projected_qty, update_modified=True)
+
 	def update_reserved_qty_for_production(self):
 		"""Update qty reserved for production from Production Item tables
 		in open work orders"""
@@ -35,11 +57,13 @@ class Bin(Document):
 			self.item_code, self.warehouse
 		)
 
-		self.set_projected_qty()
-
 		self.db_set(
 			"reserved_qty_for_production", flt(self.reserved_qty_for_production), update_modified=True
 		)
+
+		self.update_reserved_qty_for_production_plan(skip_project_qty_update=True)
+
+		self.set_projected_qty()
 		self.db_set("projected_qty", self.projected_qty, update_modified=True)
 
 	def update_reserved_qty_for_sub_contracting(self, subcontract_doctype="Subcontracting Order"):
@@ -141,6 +165,7 @@ def get_bin_details(bin_name):
 			"planned_qty",
 			"reserved_qty_for_production",
 			"reserved_qty_for_sub_contract",
+			"reserved_qty_for_production_plan",
 		],
 		as_dict=1,
 	)
@@ -188,6 +213,7 @@ def update_qty(bin_name, args):
 		- flt(reserved_qty)
 		- flt(bin_details.reserved_qty_for_production)
 		- flt(bin_details.reserved_qty_for_sub_contract)
+		- flt(bin_details.reserved_qty_for_production_plan)
 	)
 
 	frappe.db.set_value(

erpnext/stock/doctype/material_request/material_request.json

@@ -280,6 +280,7 @@
   {
    "fieldname": "set_warehouse",
    "fieldtype": "Link",
+   "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Set Target Warehouse",
    "options": "Warehouse"
@@ -355,7 +356,7 @@
  "idx": 70,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 17:58:26.366469",
+ "modified": "2023-05-07 20:17:29.108095",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Material Request",

erpnext/stock/doctype/material_request_item/material_request_item.json

@@ -419,6 +419,7 @@
    "depends_on": "eval:parent.material_request_type == \"Material Transfer\"",
    "fieldname": "from_warehouse",
    "fieldtype": "Link",
+   "ignore_user_permissions": 1,
    "label": "Source Warehouse",
    "options": "Warehouse"
   },
@@ -451,16 +452,16 @@
    "fieldname": "job_card_item",
    "fieldtype": "Data",
    "hidden": 1,
+   "label": "Job Card Item",
    "no_copy": 1,
-   "print_hide": 1,
-   "label": "Job Card Item"
+   "print_hide": 1
   }
  ],
  "idx": 1,
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-03-10 18:42:42.705190",
+ "modified": "2023-05-07 20:23:31.250252",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Material Request Item",
@@ -469,5 +470,6 @@
  "permissions": [],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }

erpnext/stock/doctype/purchase_receipt/purchase_receipt.json

@@ -1113,6 +1113,7 @@
    "depends_on": "eval: doc.is_internal_supplier",
    "fieldname": "set_from_warehouse",
    "fieldtype": "Link",
+   "ignore_user_permissions": 1,
    "label": "Set From Warehouse",
    "options": "Warehouse"
   },
@@ -1238,7 +1239,7 @@
  "idx": 261,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-12-12 18:40:32.447752",
+ "modified": "2023-05-07 20:18:25.458185",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt",

erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

@@ -379,7 +379,7 @@ class PurchaseReceipt(BuyingController):
 					)
 
 					outgoing_amount = d.base_net_amount
-					if self.is_internal_supplier and d.valuation_rate:
+					if self.is_internal_transfer() and d.valuation_rate:
 						outgoing_amount = abs(
 							frappe.db.get_value(
 								"Stock Ledger Entry",

erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py

@@ -300,9 +300,7 @@ def _get_directly_dependent_vouchers(doc):
 
 
 def notify_error_to_stock_managers(doc, traceback):
-	recipients = get_users_with_role("Stock Manager")
-	if not recipients:
-		recipients = get_users_with_role("System Manager")
+	recipients = get_recipients()
 
 	subject = _("Error while reposting item valuation")
 	message = (
@@ -319,6 +317,17 @@ def notify_error_to_stock_managers(doc, traceback):
 	frappe.sendmail(recipients=recipients, subject=subject, message=message)
 
 
+def get_recipients():
+	role = (
+		frappe.db.get_single_value("Stock Reposting Settings", "notify_reposting_error_to_role")
+		or "Stock Manager"
+	)
+
+	recipients = get_users_with_role(role)
+
+	return recipients
+
+
 def repost_entries():
 	"""
 	Reposts 'Repost Item Valuation' entries in queue.
@@ -344,7 +353,7 @@ def get_repost_item_valuation_entries():
 	return frappe.db.sql(
 		""" SELECT name from `tabRepost Item Valuation`
 		WHERE status in ('Queued', 'In Progress') and creation <= %s and docstatus = 1
-		ORDER BY timestamp(posting_date, posting_time) asc, creation asc
+		ORDER BY timestamp(posting_date, posting_time) asc, creation asc, status asc
 	""",
 		now(),
 		as_dict=1,

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -127,6 +127,7 @@ class StockEntry(StockController):
 		self.validate_fg_completed_qty()
 		self.validate_difference_account()
 		self.set_job_card_data()
+		self.validate_job_card_item()
 		self.set_purpose_for_stock_entry()
 		self.clean_serial_nos()
 		self.validate_duplicate_serial_no()
@@ -211,6 +212,24 @@ class StockEntry(StockController):
 			self.from_bom = 1
 			self.bom_no = data.bom_no
 
+	def validate_job_card_item(self):
+		if not self.job_card:
+			return
+
+		if cint(frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")):
+			return
+
+		for row in self.items:
+			if row.job_card_item:
+				continue
+
+			msg = f"""Row #{0}: The job card item reference
+				is missing. Kindly create the stock entry
+				from the job card. If you have added the row manually
+				then you won't be able to add job card item reference."""
+
+			frappe.throw(_(msg))
+
 	def validate_work_order_status(self):
 		pro_doc = frappe.get_doc("Work Order", self.work_order)
 		if pro_doc.status == "Completed":

erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json

@@ -12,7 +12,9 @@
   "start_time",
   "end_time",
   "limits_dont_apply_on",
-  "item_based_reposting"
+  "item_based_reposting",
+  "errors_notification_section",
+  "notify_reposting_error_to_role"
  ],
  "fields": [
   {
@@ -52,12 +54,23 @@
    "fieldname": "item_based_reposting",
    "fieldtype": "Check",
    "label": "Use Item based reposting"
+  },
+  {
+   "fieldname": "notify_reposting_error_to_role",
+   "fieldtype": "Link",
+   "label": "Notify Reposting Error to Role",
+   "options": "Role"
+  },
+  {
+   "fieldname": "errors_notification_section",
+   "fieldtype": "Section Break",
+   "label": "Errors Notification"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-11-02 01:22:45.155841",
+ "modified": "2023-05-04 16:14:29.080697",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reposting Settings",
@@ -76,5 +89,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }

erpnext/stock/doctype/stock_reposting_settings/test_stock_reposting_settings.py

@@ -1,9 +1,40 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-# import frappe
 import unittest
 
+import frappe
+
+from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import get_recipients
+
 
 class TestStockRepostingSettings(unittest.TestCase):
-	pass
+	def test_notify_reposting_error_to_role(self):
+		role = "Notify Reposting Role"
+
+		if not frappe.db.exists("Role", role):
+			frappe.get_doc({"doctype": "Role", "role_name": role}).insert(ignore_permissions=True)
+
+		user = "notify_reposting_error@test.com"
+		if not frappe.db.exists("User", user):
+			frappe.get_doc(
+				{
+					"doctype": "User",
+					"email": user,
+					"first_name": "Test",
+					"language": "en",
+					"time_zone": "Asia/Kolkata",
+					"send_welcome_email": 0,
+					"roles": [{"role": role}],
+				}
+			).insert(ignore_permissions=True)
+
+		frappe.db.set_single_value("Stock Reposting Settings", "notify_reposting_error_to_role", "")
+
+		users = get_recipients()
+		self.assertFalse(user in users)
+
+		frappe.db.set_single_value("Stock Reposting Settings", "notify_reposting_error_to_role", role)
+
+		users = get_recipients()
+		self.assertTrue(user in users)

erpnext/stock/report/stock_projected_qty/stock_projected_qty.py

@@ -76,6 +76,7 @@ def execute(filters=None):
 				bin.ordered_qty,
 				bin.reserved_qty,
 				bin.reserved_qty_for_production,
+				bin.reserved_qty_for_production_plan,
 				bin.reserved_qty_for_sub_contract,
 				reserved_qty_for_pos,
 				bin.projected_qty,
@@ -173,6 +174,13 @@ def get_columns():
 			"width": 100,
 			"convertible": "qty",
 		},
+		{
+			"label": _("Reserved for Production Plan"),
+			"fieldname": "reserved_qty_for_production_plan",
+			"fieldtype": "Float",
+			"width": 100,
+			"convertible": "qty",
+		},
 		{
 			"label": _("Reserved for Sub Contracting"),
 			"fieldname": "reserved_qty_for_sub_contract",
@@ -232,6 +240,7 @@ def get_bin_list(filters):
 			bin.reserved_qty,
 			bin.reserved_qty_for_production,
 			bin.reserved_qty_for_sub_contract,
+			bin.reserved_qty_for_production_plan,
 			bin.projected_qty,
 		)
 		.orderby(bin.item_code, bin.warehouse)

erpnext/stock/stock_ledger.py

@@ -560,7 +560,7 @@ class update_entries_after(object):
 			sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"]
 			and sle.voucher_detail_no
 			and sle.actual_qty < 0
-			and frappe.get_cached_value(sle.voucher_type, sle.voucher_no, "is_internal_supplier")
+			and is_internal_transfer(sle)
 		):
 			sle.outgoing_rate = get_incoming_rate_for_inter_company_transfer(sle)
 
@@ -683,7 +683,7 @@ class update_entries_after(object):
 			elif (
 				sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"]
 				and sle.voucher_detail_no
-				and frappe.get_cached_value(sle.voucher_type, sle.voucher_no, "is_internal_supplier")
+				and is_internal_transfer(sle)
 			):
 				rate = get_incoming_rate_for_inter_company_transfer(sle)
 			else:
@@ -1619,3 +1619,15 @@ def get_incoming_rate_for_inter_company_transfer(sle) -> float:
 		)
 
 	return rate
+
+
+def is_internal_transfer(sle):
+	data = frappe.get_cached_value(
+		sle.voucher_type,
+		sle.voucher_no,
+		["is_internal_supplier", "represents_company", "company"],
+		as_dict=True,
+	)
+
+	if data.is_internal_supplier and data.represents_company == data.company:
+		return True

erpnext/translations/da-DK.csv

@@ -1,29 +1,29 @@
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +153,'Opening','Åbning'
-DocType: Lead,Lead,Bly
-apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
-DocType: Timesheet,% Amount Billed,% Beløb Billed
-DocType: Purchase Order,% Billed,% Billed
-,Lead Id,Bly Id
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.py +87,{0} {1} created,{0} {1} creado
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +237,'Total','Total'
-DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
-DocType: Item Default,Default Selling Cost Center,Standard Selling Cost center
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-DocType: Pricing Rule,Selling,Selling
-DocType: Sales Order,%  Delivered,% Leveres
-DocType: Lead,Lead Owner,Bly Owner
-apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-apps/erpnext/erpnext/controllers/accounts_controller.py +377, 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)
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-,Lead Details,Bly Detaljer
-DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-,Lead Name,Bly navn
-DocType: Vehicle Service,Half Yearly,Halvdelen Årlig
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
+'Opening','Åbning'
+Lead,Bly,
+Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+% Amount Billed,% Beløb Billed,
+% Billed,% Billed,
+Lead Id,Bly Id,
+{0} {1} created,{0} {1} creado,
+'Total','Total'
+Selling Settings,Salg af indstillinger,
+Selling Amount,Selling Beløb,
+Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+Default Selling Cost Center,Standard Selling Cost center,
+90-Above,90-Above,
+Selling,Selling,
+%  Delivered,% Leveres,
+Lead Owner,Bly Owner,
+{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+ or ,o,
+% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order,
+All Lead (Open),Alle Bly (Open)
+Get Updates,Hent opdateringer,
+'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+Standard Selling,Standard Selling,
+Lead Details,Bly Detaljer,
+Settings for Selling Module,Indstillinger for Selling modul,
+Lead Name,Bly navn,
+Half Yearly,Halvdelen Årlig,
+"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"

erpnext/translations/en-US.csv

@@ -1,47 +1,47 @@
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +93,Cheques Required,Checks Required
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,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 +210,People who teach at your organisation,People who teach at your organization
-apps/erpnext/erpnext/stock/stock_ledger.py +482,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submitting/canceling this entry"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"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 +33,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 +100,"Appointment cancelled, Please review and cancel the invoice {0}","Appointment canceled, Please review and cancel the invoice {0}"
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Outstanding Checks and Deposits to clear
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +103,Appointment cancelled,Appointment canceled
-DocType: Payment Entry,Cheque/Reference Date,Check/Reference Date
-DocType: Cheque Print Template,Scanned Cheque,Scanned Check
-DocType: Cheque Print Template,Cheque Size,Check Size
-apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Maintenance Status has to be Canceled or Completed to Submit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +486,'Entries' cannot be empty,'Entries' can not be empty
-apps/erpnext/erpnext/setup/doctype/company/company.py +84,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be canceled to change the default currency."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +257,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Maintenance Visit {0} must be canceled before cancelling this Sales Order
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +235,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Sales Invoice {0} must be canceled before cancelling this Sales Order
-DocType: Bank Reconciliation Detail,Cheque Date,Check Date
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +249,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stopped Work Order cannot be canceled, Unstop it first to cancel"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +164,Material Request {0} is cancelled or stopped,Material Request {0} is canceled or stopped
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +188,Closed order cannot be cancelled. Unclose to cancel.,Closed order cannot be canceled. Unclose to cancel.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +246,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Schedule {0} must be canceled before cancelling this Sales Order
-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 +224,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 +268,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/accounts.py +240,Setup cheque dimensions for printing,Setup check dimensions for printing
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checks and Deposits incorrectly cleared
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +130,{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 +300,Packing Slip(s) cancelled,Packing Slip(s) canceled
-DocType: Payment Entry,Cheque/Reference No,Check/Reference No
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
-DocType: Cheque Print Template,Cheque Print Template,Check Print Template
-apps/erpnext/erpnext/controllers/buying_controller.py +503,{0} {1} is cancelled or closed,{0} {1} is canceled or closed
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Quotation {0} is cancelled,Quotation {0} is canceled
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +367,Timesheet {0} is already completed or cancelled,Timesheet {0} is already completed or canceled
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,Payment Canceled. Please check your GoCardless Account for more details
-apps/erpnext/erpnext/stock/doctype/item/item.py +840,Item {0} is cancelled,Item {0} is canceled
-DocType: Serial No,Is Cancelled,Is Canceled
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +227,{0} {1} is cancelled or stopped,{0} {1} is canceled or stopped
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Colour,Color
-DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel Material Visits {0} before canceling this Maintenance Visit
-DocType: Employee,Cheque,Check
-DocType: Cheque Print Template,Cheque Height,Check Height
-DocType: Cheque Print Template,Cheque Width,Check Width
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Wire Transfer,Wire Transfer
+Cheques Required,Checks Required,
+Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row #{0}: Clearance date {1} cannot be before Check Date {2}
+People who teach at your organisation,People who teach at your organization,
+"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submitting/canceling this entry"
+"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}"
+Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before canceling this Warranty Claim,
+"Appointment cancelled, Please review and cancel the invoice {0}","Appointment canceled, Please review and cancel the invoice {0}"
+Outstanding Cheques and Deposits to clear,Outstanding Checks and Deposits to clear,
+Appointment cancelled,Appointment canceled,
+Cheque/Reference Date,Check/Reference Date,
+Scanned Cheque,Scanned Check,
+Cheque Size,Check Size,
+Maintenance Status has to be Cancelled or Completed to Submit,Maintenance Status has to be Canceled or Completed to Submit,
+'Entries' cannot be empty,'Entries' can not be empty,
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be canceled to change the default currency."
+Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Maintenance Visit {0} must be canceled before cancelling this Sales Order,
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Sales Invoice {0} must be canceled before cancelling this Sales Order,
+Cheque Date,Check Date,
+"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stopped Work Order cannot be canceled, Unstop it first to cancel"
+Material Request {0} is cancelled or stopped,Material Request {0} is canceled or stopped,
+Closed order cannot be cancelled. Unclose to cancel.,Closed order cannot be canceled. Unclose to cancel.
+Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Schedule {0} must be canceled before cancelling this Sales Order,
+Unlink Payment on Cancellation of Invoice,Unlink Payment on Cancelation of Invoice,
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery Notes {0} must be canceled before cancelling this Sales Order,
+Work Order {0} must be cancelled before cancelling this Sales Order,Work Order {0} must be canceled before cancelling this Sales Order,
+Setup cheque dimensions for printing,Setup check dimensions for printing,
+Cheques and Deposits incorrectly cleared,Checks and Deposits incorrectly cleared,
+{0} {1} is cancelled so the action cannot be completed,{0} {1} is canceled so the action cannot be completed,
+Packing Slip(s) cancelled,Packing Slip(s) canceled,
+Cheque/Reference No,Check/Reference No,
+"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
+Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
+Cheque Print Template,Check Print Template,
+{0} {1} is cancelled or closed,{0} {1} is canceled or closed,
+Quotation {0} is cancelled,Quotation {0} is canceled,
+Timesheet {0} is already completed or cancelled,Timesheet {0} is already completed or canceled,
+Payment Cancelled. Please check your GoCardless Account for more details,Payment Canceled. Please check your GoCardless Account for more details,
+Item {0} is cancelled,Item {0} is canceled,
+Is Cancelled,Is Canceled,
+{0} {1} is cancelled or stopped,{0} {1} is canceled or stopped,
+Colour,Color,
+Cheque Number,Check Number,
+Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel Material Visits {0} before canceling this Maintenance Visit,
+Cheque,Check,
+Cheque Height,Check Height,
+Cheque Width,Check Width,
+Wire Transfer,Wire Transfer,

erpnext/translations/es-AR.csv

@@ -1,6 +1,6 @@
-DocType: Fee Structure,Components,Componentes
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},"Empleado {0}, media jornada el día {1}"
-DocType: Purchase Invoice Item,Item,Producto
-DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdidas
-DocType: Cheque Print Template,Cheque Size,Tamaño de Cheque
-apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Hacer lotes de Estudiante
+Components,Componentes,
+Employee {0} on Half day on {1},"Empleado {0}, media jornada el día {1}"
+Item,Producto,
+Deductions or Loss,Deducciones o Pérdidas,
+Cheque Size,Tamaño de Cheque,
+Make Student Batch,Hacer lotes de Estudiante,

erpnext/translations/es-CL.csv

@@ -1,32 +1,32 @@
-DocType: Assessment Plan,Grading Scale,Escala de Calificación
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Número de Móvil de Guardián 1
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Ganancia / Pérdida Bruta
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Los cheques y depósitos resueltos de forma incorrecta
-DocType: Assessment Group,Parent Assessment Group,Grupo de Evaluación Padre
-DocType: Student,Guardians,Guardianes
-DocType: Fee Schedule,Fee Schedule,Programa de Tarifas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1021,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
-DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web
-DocType: Delivery Note,% Installed,% Instalado
-DocType: Student,Guardian Details,Detalles del Guardián
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nombre de Guardián 1
-DocType: Grading Scale Interval,Grade Code,Grado de Código
-DocType: Fee Schedule,Fee Structure,Estructura de Tarifas
-DocType: Purchase Order,Get Items from Open Material Requests,Obtener Ítems de Solicitudes Abiertas de Materiales
-,Batch Item Expiry Status,Estatus de Expiración de Lote de Ítems
-DocType: Guardian,Guardian Interests,Intereses del Guardián
-DocType: Guardian,Guardian Name,Nombre del Guardián
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Artículo hijo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar
-DocType: BOM Scrap Item,Basic Amount (Company Currency),Monto Base (Divisa de Compañía)
-DocType: Grading Scale,Grading Scale Name,Nombre de Escala de Calificación
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Número de Móvil de Guardián 2
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nombre de Guardián 2
-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 +230,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 +6,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)
+Grading Scale,Escala de Calificación,
+Guardian1 Mobile No,Número de Móvil de Guardián 1,
+Gross Profit / Loss,Ganancia / Pérdida Bruta,
+Cheques and Deposits incorrectly cleared,Los cheques y depósitos resueltos de forma incorrecta,
+Parent Assessment Group,Grupo de Evaluación Padre,
+Guardians,Guardianes,
+Fee Schedule,Programa de Tarifas,
+Get Items from Product Bundle,Obtener Ítems de Paquete de Productos,
+BOM does not contain any stock item,BOM no contiene ningún ítem de stock,
+Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web,
+% Installed,% Instalado,
+Guardian Details,Detalles del Guardián,
+Guardian1 Name,Nombre de Guardián 1,
+Grade Code,Grado de Código,
+Fee Structure,Estructura de Tarifas,
+Get Items from Open Material Requests,Obtener Ítems de Solicitudes Abiertas de Materiales,
+Batch Item Expiry Status,Estatus de Expiración de Lote de Ítems,
+Guardian Interests,Intereses del Guardián,
+Guardian Name,Nombre del Guardián,
+Child Item should not be a Product Bundle. Please remove item `{0}` and save,Artículo hijo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar,
+Basic Amount (Company Currency),Monto Base (Divisa de Compañía)
+Grading Scale Name,Nombre de Escala de Calificación,
+Guardian2 Mobile No,Número de Móvil de Guardián 2,
+Guardian2 Name,Nombre de Guardián 2,
+Customer or Supplier Details,Detalle de cliente o proveedor,
+Course Scheduling Tool,Herramienta de Programación de cursos,
+Checkout Settings,Ajustes de Finalización de Pedido,
+Guardian Interest,Interés del Guardián,
+Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las lecturas se pueden programar."
+Checkout,Finalizando pedido,
+Guardian Student,Guardián del Estudiante,
+Base Hour Rate(Company Currency),Tarifa Base por Hora (Divisa de Compañía)

erpnext/translations/es-CO.csv

@@ -1,3 +1,3 @@
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Barcode {0} is not a valid {1} code,El código de barras {0} no es un código válido {1}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +190,{0} on Half day Leave on {1},{0} Ausente medio día en {1}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +200,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no tiene agenda del profesional médico . Añádelo al médico correspondiente.
+Barcode {0} is not a valid {1} code,El código de barras {0} no es un código válido {1}
+{0} on Half day Leave on {1},{0} Ausente medio día en {1}
+{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no tiene agenda del profesional médico . Añádelo al médico correspondiente.

erpnext/translations/es-EC.csv

@@ -1,12 +1,12 @@
-DocType: Supplier,Block Supplier,Bloque de Proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +742,"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
-apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,No se puede crear una bonificación de retención para los empleados que se han marchado
-apps/erpnext/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py +23,Cancel the journal entry {0} first,Cancelar el ingreso diario {0} primero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,No se puede transferir Empleado con estado ah salido
-DocType: Employee Benefit Claim,Benefit Type and Amount,Tipo de beneficio y monto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +878,Block Invoice,Bloque de Factura
-apps/erpnext/erpnext/stock/doctype/item/item.py +742,"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
-DocType: Item,Asset Naming Series,Series de Nombres de Activos
-,BOM Variance Report,Informe de varianza BOM(Lista de Materiales)
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,No se puede promover Empleado con estado ha salido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Auto repeat document updated,Repetición automática del documento actualizado
+Block Supplier,Bloque de Proveedor,
+"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
+Cannot create Retention Bonus for left Employees,No se puede crear una bonificación de retención para los empleados que se han marchado,
+Cancel the journal entry {0} first,Cancelar el ingreso diario {0} primero,
+Cannot transfer Employee with status Left,No se puede transferir Empleado con estado ah salido,
+Benefit Type and Amount,Tipo de beneficio y monto,
+Block Invoice,Bloque de Factura,
+"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
+Asset Naming Series,Series de Nombres de Activos,
+BOM Variance Report,Informe de varianza BOM(Lista de Materiales)
+Cannot promote Employee with status Left,No se puede promover Empleado con estado ha salido,
+Auto repeat document updated,Repetición automática del documento actualizado,

erpnext/translations/es-GT.csv

@@ -1,7 +1,7 @@
-DocType: Instructor Log,Other Details,Otros Detalles
-DocType: Material Request Item,Lead Time Date,Fecha de la Iniciativa
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de ejecución en días
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Outstanding Amt,Saldo Pendiente
-DocType: Bank Statement Transaction Invoice Item,Outstanding Amount,Saldo Pendiente
-DocType: Payment Entry Reference,Outstanding,Pendiente
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
+Other Details,Otros Detalles,
+Lead Time Date,Fecha de la Iniciativa,
+Lead Time Days,Tiempo de ejecución en días,
+Outstanding Amt,Saldo Pendiente,
+Outstanding Amount,Saldo Pendiente,
+Outstanding,Pendiente,
+Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa,

erpnext/translations/es-MX.csv

@@ -1,22 +1,22 @@
-DocType: Timesheet,Total Costing Amount,Monto Total Calculado
-DocType: Leave Policy,Leave Policy Details,Detalles de Política de Licencia
-apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html +35,Mode of Payments,Forma de pago
-DocType: Student Group Student,Student Group Student,Alumno de Grupo de Estudiantes
-DocType: Delivery Note,% Installed,% Instalado
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +55,The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,La cantidad de {0} establecida en esta solicitud de pago es diferente de la cantidad calculada para todos los planes de pago: {1}. Verifique que esto sea correcto antes de enviar el documento.
-DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta de ganancia/pérdida en la disposición de activos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +550,Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
-DocType: Loyalty Point Entry,Loyalty Point Entry,Entrada de Punto de Lealtad
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +372,Please set the Item Code first,"Por favor, primero define el Código del Artículo"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +76,Show unclosed fiscal year's P&L balances,Mostrar saldos de Ganancias y Perdidas de año fiscal sin cerrar
-,Support Hour Distribution,Distribución de Hora de Soporte
-apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Fortaleza de Grupo Estudiante
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +197,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida  por Ventas de Activos' en la empresa {0}
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +58,Leave Type {0} cannot be allocated since it is leave without pay,Tipo de Permiso {0} no puede ser asignado ya que es un Permiso sin paga
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +48,The payment gateway account in plan {0} is different from the payment gateway account in this payment request,La cuenta para pasarela de pago en el plan {0} es diferente de la cuenta de pasarela de pago en en esta petición de pago
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +488,Show Salary Slip,Mostrar Recibo de Nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +328,Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas
-DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+Total Costing Amount,Monto Total Calculado,
+Leave Policy Details,Detalles de Política de Licencia,
+Mode of Payments,Forma de pago,
+Student Group Student,Alumno de Grupo de Estudiantes,
+% Installed,% Instalado,
+The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,La cantidad de {0} establecida en esta solicitud de pago es diferente de la cantidad calculada para todos los planes de pago: {1}. Verifique que esto sea correcto antes de enviar el documento.
+Gain/Loss Account on Asset Disposal,Cuenta de ganancia/pérdida en la disposición de activos,
+Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
+Loyalty Point Entry,Entrada de Punto de Lealtad,
+Please set the Item Code first,"Por favor, primero define el Código del Artículo"
+Show unclosed fiscal year's P&L balances,Mostrar saldos de Ganancias y Perdidas de año fiscal sin cerrar,
+Support Hour Distribution,Distribución de Hora de Soporte
+Student Group Strength,Fortaleza de Grupo Estudiante,
+Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida  por Ventas de Activos' en la empresa {0}
+Leave Type {0} cannot be allocated since it is leave without pay,Tipo de Permiso {0} no puede ser asignado ya que es un Permiso sin paga,
+The payment gateway account in plan {0} is different from the payment gateway account in this payment request,La cuenta para pasarela de pago en el plan {0} es diferente de la cuenta de pasarela de pago en en esta petición de pago,
+Show Salary Slip,Mostrar Recibo de Nómina,
+Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas,
+"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
 
@@ -28,7 +28,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
     - This can be on **Net Total** (that is the sum of basic amount).
     - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
     - **Actual** (as mentioned).
-2. Account Head: The Account ledger under which this tax will be booked
+2. Account Head: The Account ledger under which this tax will be booked,
 3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
 4. Description: Description of the tax (that will be printed in invoices / quotes).
 5. Rate: Tax rate.
@@ -57,28 +57,28 @@ La tasa impositiva que se defina aquí será la tasa de gravamen predeterminada
  8. Línea de referencia: Si se basa en ""Línea anterior al total"" se puede seleccionar el número de la fila que será tomado como base para este cálculo (por defecto es la fila anterior).
  9. Considerar impuesto o cargo para: En esta sección se puede especificar si el impuesto / cargo es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +160,Leave Type {0} cannot be carry-forwarded,Tipo de Permiso {0} no se puede arrastar o trasladar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el Tipo de Cambio para convertir de una divisa a otra
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +46,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
-DocType: Loyalty Point Entry,Loyalty Program,Programa de Lealtad
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +163,Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","El Artículo de Servico, el Tipo, la Frecuencia y la Cantidad de Gasto son requeridos"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio
-DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
-DocType: Lab Test Template,Standard Selling Rate,Tarifa de Venta Estándar
-DocType: Program Enrollment,School House,Casa Escuela
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
-apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +48,Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima
-DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el número de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el número de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de Inventario."
-apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, establezca el filtro de Compañía en blanco si Agrupar Por es 'Compañía'"
-DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para Grupo de Estudiantes por Curso, el Curso será validado para cada Estudiante de los Cursos inscritos en la Inscripción del Programa."
-DocType: Leave Policy Detail,Leave Policy Detail,Detalles de política de Licencia
-DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para grupo de estudiantes por lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
-DocType: Subscription Plan,Payment Plan,Plan de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +731,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de Variantes después de la transacción de inventario. Deberá crear un nuevo artículo para hacer esto.
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +98,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,La cantidad de existencias para comenzar el procedimiento no está disponible en el almacén. ¿Desea registrar una transferencia de inventario?
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +259,"Company, Payment Account, From Date and To Date is mandatory","Empresa, cuenta de pago, fecha de inicio y fecha final son obligatorios"
-DocType: Leave Encashment,Leave Encashment,Cobro de Permiso
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1211,Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega
-DocType: Salary Structure,Leave Encashment Amount Per Day,Cantidad por día para pago por Ausencia
+Leave Type {0} cannot be carry-forwarded,Tipo de Permiso {0} no se puede arrastar o trasladar,
+Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos,
+Specify Exchange Rate to convert one currency into another,Especificar el Tipo de Cambio para convertir de una divisa a otra,
+Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
+Loyalty Program,Programa de Lealtad,
+Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes,
+"Service Item,Type,frequency and expense amount are required","El Artículo de Servico, el Tipo, la Frecuencia y la Cantidad de Gasto son requeridos"
+Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio,
+Customer or Supplier Details,Detalle de cliente o proveedor,
+Standard Selling Rate,Tarifa de Venta Estándar,
+School House,Casa Escuela,
+Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
+Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima,
+"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el número de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el número de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de Inventario."
+Please set Company filter blank if Group By is 'Company',"Por favor, establezca el filtro de Compañía en blanco si Agrupar Por es 'Compañía'"
+"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para Grupo de Estudiantes por Curso, el Curso será validado para cada Estudiante de los Cursos inscritos en la Inscripción del Programa."
+Leave Policy Detail,Detalles de política de Licencia,
+"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para grupo de estudiantes por lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
+Payment Plan,Plan de pago,
+Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de Variantes después de la transacción de inventario. Deberá crear un nuevo artículo para hacer esto.
+Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,La cantidad de existencias para comenzar el procedimiento no está disponible en el almacén. ¿Desea registrar una transferencia de inventario?
+"Company, Payment Account, From Date and To Date is mandatory","Empresa, cuenta de pago, fecha de inicio y fecha final son obligatorios"
+Leave Encashment,Cobro de Permiso,
+Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega,
+Leave Encashment Amount Per Day,Cantidad por día para pago por Ausencia,

erpnext/translations/es-NI.csv

@@ -1,16 +1,16 @@
-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 +873,Bill of Materials,Lista de Materiales
-apps/erpnext/erpnext/controllers/accounts_controller.py +703,'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
-DocType: Activity Cost,Billing Rate,Monto de Facturación
-apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de Saldos Contables
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
-DocType: Tax Rule,Billing County,Municipio de Facturación
-DocType: Sales Invoice Timesheet,Billing Hours,Horas de Facturación
-DocType: Timesheet,Billing Details,Detalles de Facturación
-DocType: Tax Rule,Billing State,Región de Facturación
-DocType: Purchase Order Item,Billed Amt,Monto Facturado
-DocType: Item Tax,Tax Rate,Tasa de Impuesto
+Tax Rule,Regla Fiscal,
+Account for Change Amount,Cuenta para el Cambio de Monto,
+Bill of Materials,Lista de Materiales,
+'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
+Tax ID,RUC,
+Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
+Bill,Factura,
+Billing Rate,Monto de Facturación,
+Opening Accounting Balance,Apertura de Saldos Contables,
+Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
+Billing County,Municipio de Facturación,
+Billing Hours,Horas de Facturación,
+Billing Details,Detalles de Facturación,
+Billing State,Región de Facturación,
+Billed Amt,Monto Facturado,
+Tax Rate,Tasa de Impuesto,

erpnext/translations/fr-CA.csv

@@ -1,14 +1,14 @@
-DocType: Production Plan Item,Ordered Qty,Quantité commandée
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Le Centre de Coûts {2} ne fait pas partie de la Société {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit un montant au débit ou crédit est nécessaire pour {2}
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taux de la Liste de Prix (Devise de la Compagnie)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est requis envers un compte à recevoir {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite qu'en devise: {3}
-DocType: Purchase Invoice Item,Price List Rate,Taux de la Liste de Prix
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est requis envers un compte à payer {2}
-DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique du taux à la Liste de Prix si manquant
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Le compte {2} ne fait pas partie de la Société {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Le compte {2} de type 'Profit et Perte' n'est pas admis dans une Entrée d'Ouverture
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Le compte {2} est inactif
-DocType: Journal Entry,Difference (Dr - Cr),Différence (Dt - Ct )
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}: Le compte {2} ne peut pas être un Groupe
+Ordered Qty,Quantité commandée,
+{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Le Centre de Coûts {2} ne fait pas partie de la Société {3}
+{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit un montant au débit ou crédit est nécessaire pour {2}
+Price List Rate (Company Currency),Taux de la Liste de Prix (Devise de la Compagnie)
+{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est requis envers un compte à recevoir {2}
+{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite qu'en devise: {3}
+Price List Rate,Taux de la Liste de Prix,
+{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est requis envers un compte à payer {2}
+Auto insert Price List rate if missing,Insertion automatique du taux à la Liste de Prix si manquant,
+{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Le compte {2} ne fait pas partie de la Société {3}
+{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Le compte {2} de type 'Profit et Perte' n'est pas admis dans une Entrée d'Ouverture,
+{0} {1}: Account {2} is inactive,{0} {1}: Le compte {2} est inactif,
+Difference (Dr - Cr),Différence (Dt - Ct )
+{0} {1}: Account {2} cannot be a Group,{0} {1}: Le compte {2} ne peut pas être un Groupe,

erpnext/translations/fr.csv

@@ -951,7 +951,7 @@ End time cannot be before start time,L'heure de fin ne peut pas être avant l'he
 Ends On date cannot be before Next Contact Date.,La date de fin ne peut pas être avant la prochaine date de contact,
 Energy,Énergie,
 Engineer,Ingénieur,
-Enough Parts to Build,Pièces Suffisantes pour Construire
+Enough Parts to Build,Pièces Suffisantes pour Construire,
 Enroll,Inscrire,
 Enrolling student,Inscrire un étudiant,
 Enrolling students,Inscription des étudiants,
@@ -3037,7 +3037,7 @@ To Date must be greater than From Date,La date de fin doit être supérieure à
 To Date should be within the Fiscal Year. Assuming To Date = {0},La Date Finale doit être dans l'exercice. En supposant Date Finale = {0},
 To Datetime,À la Date,
 To Deliver,À Livrer,
-{}  To Deliver,{} à livrer
+{}  To Deliver,{} à livrer,
 To Deliver and Bill,À Livrer et Facturer,
 To Fiscal Year,À l'année fiscale,
 To GSTIN,GSTIN (Destination),
@@ -4943,8 +4943,8 @@ Min Qty,Qté Min,
 Max Qty,Qté Max,
 Min Amt,Montant Min,
 Max Amt,Montant Max,
-"If rate is zero them item will be treated as ""Free Item""",Si le prix est à 0 alors l'article sera traité comme article gratuit
-Is Recursive,Est récursif
+"If rate is zero them item will be treated as ""Free Item""",Si le prix est à 0 alors l'article sera traité comme article gratuit,
+Is Recursive,Est récursif,
 "Discounts to be applied in sequential ranges like buy 1 get 1, buy 2 get 2, buy 3 get 3 and so on","La remise sera appliquée séquentiellement telque : acheter 1 => recupérer 1, acheter 2 => recupérer 2, acheter 3 => recupérer 3, etc..."
 Period Settings,Paramètres de période,
 Margin,Marge,
@@ -7240,7 +7240,7 @@ Replace,Remplacer,
 Update latest price in all BOMs,Mettre à jour le prix le plus récent dans toutes les nomenclatures,
 BOM Website Item,Article de nomenclature du Site Internet,
 BOM Website Operation,Opération de nomenclature du Site Internet,
-Operation Time,Durée de l'Opération
+Operation Time,Durée de l'Opération,
 PO-JOB.#####,PO-JOB. #####,
 Timing Detail,Détail du timing,
 Time Logs,Time Logs,
@@ -9834,92 +9834,92 @@ Enable European Access,Activer l'accès européen,
 Creating Purchase Order ...,Création d'une commande d'achat ...,
 "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only.","Sélectionnez un fournisseur parmi les fournisseurs par défaut des articles ci-dessous. Lors de la sélection, une commande d'achat sera effectué contre des articles appartenant uniquement au fournisseur sélectionné.",
 Row #{}: You must select {} serial numbers for item {}.,Ligne n ° {}: vous devez sélectionner {} numéros de série pour l'article {}.,
-Update Rate as per Last Purchase,Mettre à jour avec les derniers prix d'achats
-Company Shipping Address,Adresse d'expédition
-Shipping Address Details,Détail d'adresse d'expédition
-Company Billing Address,Adresse de la société de facturation
+Update Rate as per Last Purchase,Mettre à jour avec les derniers prix d'achats,
+Company Shipping Address,Adresse d'expédition,
+Shipping Address Details,Détail d'adresse d'expédition,
+Company Billing Address,Adresse de la société de facturation,
 Supplier Address Details,
-Bank Reconciliation Tool,Outil de réconcialiation d'écritures bancaires
-Supplier Contact,Contact fournisseur
-Subcontracting,Sous traitance
-Order Status,Statut de la commande
-Build,Personnalisations avancées
-Dispatch Address Name,Adresse de livraison intermédiaire
-Amount Eligible for Commission,Montant éligible à comission
-Grant Commission,Eligible aux commissions
-Stock Transactions Settings, Paramétre des transactions
-Role Allowed to Over Deliver/Receive, Rôle autorisé à dépasser cette limite
-Users with this role are allowed to over deliver/receive against orders above the allowance percentage,Rôle Utilisateur qui sont autorisé à livrée/commandé au-delà de la limite
-Over Transfer Allowance,Autorisation de limite de transfert
-Quality Inspection Settings,Paramétre de l'inspection qualité
-Action If Quality Inspection Is Rejected,Action si l'inspection qualité est rejetée
-Disable Serial No And Batch Selector,Désactiver le sélecteur de numéro de lot/série
-Is Rate Adjustment Entry (Debit Note),Est un justement du prix de la note de débit
-Issue a debit note with 0 qty against an existing Sales Invoice,Creer une note de débit avec une quatité à O pour la facture
-Control Historical Stock Transactions,Controle de l'historique des stransaction de stock
+Bank Reconciliation Tool,Outil de réconcialiation d'écritures bancaires,
+Supplier Contact,Contact fournisseur,
+Subcontracting,Sous traitance,
+Order Status,Statut de la commande,
+Build,Personnalisations avancées,
+Dispatch Address Name,Adresse de livraison intermédiaire,
+Amount Eligible for Commission,Montant éligible à comission,
+Grant Commission,Eligible aux commissions,
+Stock Transactions Settings, Paramétre des transactions,
+Role Allowed to Over Deliver/Receive, Rôle autorisé à dépasser cette limite,
+Users with this role are allowed to over deliver/receive against orders above the allowance percentage,Rôle Utilisateur qui sont autorisé à livrée/commandé au-delà de la limite,
+Over Transfer Allowance,Autorisation de limite de transfert,
+Quality Inspection Settings,Paramétre de l'inspection qualits,
+Action If Quality Inspection Is Rejected,Action si l'inspection qualité est rejetée,
+Disable Serial No And Batch Selector,Désactiver le sélecteur de numéro de lot/série,
+Is Rate Adjustment Entry (Debit Note),Est un justement du prix de la note de débit,
+Issue a debit note with 0 qty against an existing Sales Invoice,Creer une note de débit avec une quatité à O pour la facture,
+Control Historical Stock Transactions,Controle de l'historique des stransaction de stock,
 No stock transactions can be created or modified before this date.,Aucune transaction ne peux être créée ou modifié avant cette date.
-Stock transactions that are older than the mentioned days cannot be modified.,Les transactions de stock plus ancienne que le nombre de jours ci-dessus ne peuvent être modifiées
-Role Allowed to Create/Edit Back-dated Transactions,Rôle autorisé à créer et modifier des transactions anti-datée
+Stock transactions that are older than the mentioned days cannot be modified.,Les transactions de stock plus ancienne que le nombre de jours ci-dessus ne peuvent être modifiées,
+Role Allowed to Create/Edit Back-dated Transactions,Rôle autorisé à créer et modifier des transactions anti-datée,
 "If mentioned, the system will allow only the users with this Role to create or modify any stock transaction earlier than the latest stock transaction for a specific item and warehouse. If set as blank, it allows all users to create/edit back-dated transactions.","Les utilisateur de ce role pourront creer et modifier des transactions dans le passé. Si vide tout les utilisateurs pourrons le faire"
-Auto Insert Item Price If Missing,Création du prix de l'article dans les listes de prix si abscent
-Update Existing Price List Rate,Mise a jour automatique du prix dans les listes de prix
-Show Barcode Field in Stock Transactions,Afficher le champ Code Barre dans les transactions de stock
-Convert Item Description to Clean HTML in Transactions,Convertir les descriptions d'articles en HTML valide lors des transactions
-Have Default Naming Series for Batch ID?,Nom de série par défaut pour les Lots ou Séries
+Auto Insert Item Price If Missing,Création du prix de l'article dans les listes de prix si abscent,
+Update Existing Price List Rate,Mise a jour automatique du prix dans les listes de prix,
+Show Barcode Field in Stock Transactions,Afficher le champ Code Barre dans les transactions de stock,
+Convert Item Description to Clean HTML in Transactions,Convertir les descriptions d'articles en HTML valide lors des transactions,
+Have Default Naming Series for Batch ID?,Nom de série par défaut pour les Lots ou Séries,
 "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units","Le pourcentage de quantité que vous pourrez réceptionner en plus de la quantité commandée. Par exemple, vous avez commandé 100 unités, votre pourcentage de dépassement est de 10%, vous pourrez réceptionner 110 unités"
-Allowed Items,Articles autorisés
-Party Specific Item,Restriction d'article disponible
-Restrict Items Based On,Type de critére de restriction
-Based On Value,critére de restriction
+Allowed Items,Articles autorisés,
+Party Specific Item,Restriction d'article disponible,
+Restrict Items Based On,Type de critére de restriction,
+Based On Value,critére de restriction,
 Unit of Measure (UOM),Unité de mesure (UdM),
 Unit Of Measure (UOM),Unité de mesure (UdM),
-CRM Settings,Paramètres CRM
-Do Not Explode,Ne pas décomposer
-Quick Access, Accés rapides
-{}  Available,{} Disponible.s
-{} Pending,{} En attente.s
-{} To Bill,{} à facturer
-{}  To Receive,{} A recevoir
+CRM Settings,Paramètres CRM,
+Do Not Explode,Ne pas décomposer,
+Quick Access, Accés rapides,
+{}  Available,{} Disponible.s,
+{} Pending,{} En attente.s,
+{} To Bill,{} à facturer,
+{}  To Receive,{} A recevoir,
 {} Active,{} Actif.ve(s)
 {} Open,{} Ouvert.e(s)
-Incorrect Data Report,Rapport de données incohérentes
-Incorrect Serial No Valuation,Valorisation inccorecte par Num. Série / Lots
-Incorrect Balance Qty After Transaction,Equilibre des quantités aprés une transaction
-Interview Type,Type d'entretien
-Interview Round,Cycle d'entretien
-Interview,Entretien
-Interview Feedback,Retour d'entretien
-Journal Energy Point,Historique des points d'énergies
+Incorrect Data Report,Rapport de données incohérentes,
+Incorrect Serial No Valuation,Valorisation inccorecte par Num. Série / Lots,
+Incorrect Balance Qty After Transaction,Equilibre des quantités aprés une transaction,
+Interview Type,Type d'entretien,
+Interview Round,Cycle d'entretien,
+Interview,Entretien,
+Interview Feedback,Retour d'entretien,
+Journal Energy Point,Historique des points d'énergies,
 Billing Address Details,Adresse de facturation (détails)
 Supplier Address Details,Adresse Fournisseur (détails)
-Retail,Commerce
-Users,Utilisateurs
-Permission Manager,Gestion des permissions
-Fetch Timesheet,Récuprer les temps saisis
-Get Supplier Group Details,Appliquer les informations depuis le Groupe de fournisseur
-Quality Inspection(s),Inspection(s) Qualité
-Set Advances and Allocate (FIFO),Affecter les encours au réglement
-Apply Putaway Rule,Appliquer la régle de routage d'entrepot
-Delete Transactions,Supprimer les transactions
-Default Payment Discount Account,Compte par défaut des paiements de remise
-Unrealized Profit / Loss Account,Compte de perte
-Enable Provisional Accounting For Non Stock Items,Activer la provision pour les articles non stockés
-Publish in Website,Publier sur le Site Web
-List View,Vue en liste
-Allow Excess Material Transfer,Autoriser les transfert de stock supérieurs à l'attendue
-Allow transferring raw materials even after the Required Quantity is fulfilled,Autoriser les transfert  de matiéres premiére mais si la quantité requise est atteinte
-Add Corrective Operation Cost in Finished Good Valuation,Ajouter des opérations de correction de coût pour la valorisation des produits finis
-Make Serial No / Batch from Work Order,Générer des numéros de séries / lots depuis les Ordres de Fabrications
-System will automatically create the serial numbers / batch for the Finished Good on submission of work order,le systéme va créer des numéros de séries / lots à la validation des produit finis depuis les Ordres de Fabrications
-Allow material consumptions without immediately manufacturing finished goods against a Work Order,Autoriser la consommation sans immédiatement fabriqué les produit fini dans les ordres de fabrication
-Quality Inspection Parameter,Paramétre des Inspection Qualité
-Parameter Group,Groupe de paramétre
-E Commerce Settings,Paramétrage E-Commerce
-Follow these steps to create a landing page for your store:,Suivez les intructions suivantes pour créer votre page d'accueil de boutique en ligne
-Show Price in Quotation,Afficher les prix sur les devis
-Add-ons,Extensions
-Enable Wishlist,Activer la liste de souhaits
-Enable Reviews and Ratings,Activer les avis et notes
-Enable Recommendations,Activer les recommendations
-Item Search Settings,Paramétrage de la recherche d'article
-Purchase demande,Demande de materiel
+Retail,Commerce,
+Users,Utilisateurs,
+Permission Manager,Gestion des permissions,
+Fetch Timesheet,Récuprer les temps saisis,
+Get Supplier Group Details,Appliquer les informations depuis le Groupe de fournisseur,
+Quality Inspection(s),Inspection(s) Qualite,
+Set Advances and Allocate (FIFO),Affecter les encours au réglement,
+Apply Putaway Rule,Appliquer la régle de routage d'entrepot,
+Delete Transactions,Supprimer les transactions,
+Default Payment Discount Account,Compte par défaut des paiements de remise,
+Unrealized Profit / Loss Account,Compte de perte,
+Enable Provisional Accounting For Non Stock Items,Activer la provision pour les articles non stockés,
+Publish in Website,Publier sur le Site Web,
+List View,Vue en liste,
+Allow Excess Material Transfer,Autoriser les transfert de stock supérieurs à l'attendue,
+Allow transferring raw materials even after the Required Quantity is fulfilled,Autoriser les transfert  de matiéres premiére mais si la quantité requise est atteinte,
+Add Corrective Operation Cost in Finished Good Valuation,Ajouter des opérations de correction de coût pour la valorisation des produits finis,
+Make Serial No / Batch from Work Order,Générer des numéros de séries / lots depuis les Ordres de Fabrications,
+System will automatically create the serial numbers / batch for the Finished Good on submission of work order,le systéme va créer des numéros de séries / lots à la validation des produit finis depuis les Ordres de Fabrications,
+Allow material consumptions without immediately manufacturing finished goods against a Work Order,Autoriser la consommation sans immédiatement fabriqué les produit fini dans les ordres de fabrication,
+Quality Inspection Parameter,Paramétre des Inspection Qualite,
+Parameter Group,Groupe de paramétre,
+E Commerce Settings,Paramétrage E-Commerce,
+Follow these steps to create a landing page for your store:,Suivez les intructions suivantes pour créer votre page d'accueil de boutique en ligne,
+Show Price in Quotation,Afficher les prix sur les devis,
+Add-ons,Extensions,
+Enable Wishlist,Activer la liste de souhaits,
+Enable Reviews and Ratings,Activer les avis et notes,
+Enable Recommendations,Activer les recommendations,
+Item Search Settings,Paramétrage de la recherche d'article,
+Purchase demande,Demande de materiel,

erpnext/translations/quc.csv

@@ -1,13 +1,13 @@
-apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Riq jun ajilib’al jechataj chupam re le nima wuj teq xa sach che le uk’exik
-DocType: Company,Create Chart Of Accounts Based On,Kujak uwach etal pa ri
-DocType: Program Enrollment Fee,Program Enrollment Fee,Rajil re utz’ib’axik pale cholb’al chak
-DocType: Employee Transfer,New Company,K’ak’ chakulib’al
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Utz re uk’ayixik le q’atoj le copanawi le ka loq’ik
-DocType: Opportunity,Opportunity Type,Uwach ramajil
-DocType: Fee Schedule,Fee Schedule,Cholb’al chak utojik jujunal
-DocType: Cheque Print Template,Cheque Width,Nim uxach uk’exwach pwaq
-apps/erpnext/erpnext/hr/doctype/employee/employee.js,Please enter Preferred Contact Email,Taquqxa’n kematz’ib’m uj’el
-DocType: Item,Supplier Items,Q’ataj che uyaik
-,Stock Ageing,Najtir k’oji’k
-apps/erpnext/erpnext/education/doctype/student/student.py,Date of Birth cannot be greater than today.,Ler q’ij k’ojik kumaj taj che le q’ij re kamik
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py,Transactions can only be deleted by the creator of the Company,Le uk’exik xaqxu’ kakiw uk’exik le b’anowik le chakulib’al
+Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Riq jun ajilib’al jechataj chupam re le nima wuj teq xa sach che le uk’exik,
+Create Chart Of Accounts Based On,Kujak uwach etal pa ri,
+Program Enrollment Fee,Rajil re utz’ib’axik pale cholb’al chak,
+New Company,K’ak’ chakulib’al,
+Validate Selling Price for Item against Purchase Rate or Valuation Rate,Utz re uk’ayixik le q’atoj le copanawi le ka loq’ik,
+Opportunity Type,Uwach ramajil,
+Fee Schedule,Cholb’al chak utojik jujunal,
+Cheque Width,Nim uxach uk’exwach pwaq,
+Please enter Preferred Contact Email,Taquqxa’n kematz’ib’m uj’el,
+Supplier Items,Q’ataj che uyaik,
+Stock Ageing,Najtir k’oji’k,
+Date of Birth cannot be greater than today.,Ler q’ij k’ojik kumaj taj che le q’ij re kamik,
+Transactions can only be deleted by the creator of the Company,Le uk’exik xaqxu’ kakiw uk’exik le b’anowik le chakulib’al,

erpnext/translations/tr.csv

@@ -3472,7 +3472,6 @@ Completed By,Tamamlayan,
 Conditions,Koşullar,
 County,Kontluk,
 Day of Week,Haftanın günü,
-"Dear System Manager,Sevgili Sistem Yöneticisi,",
 Default Value,Varsayılan Değer,
 Email Group,E-posta Grubu,
 Email Settings,E-posta Ayarları,
@@ -9935,7 +9934,7 @@ Items to Order and Receive,Sipariş Edilecek ve Alınacak Ürünler,
 Customize Print Formats,Baskı Biçimlerini Özelleştirin,
 Generate Custom Reports,Özel Raporlar Oluşturun,
 Partly Paid,Kısmen Ödenmiş,
-Partly Paid and Discounted,Kısmen Ödenmiş ve İndirimli
+Partly Paid and Discounted,Kısmen Ödenmiş ve İndirimli,
 Fixed Time,Sabit Süre,
 Loan Write Off,Kredi İptali,
 Returns,İadeler,