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

…t-value-through-landed-cost-voucher
frappe · Sep 3, 2024 · 2fdc56c · 2fdc56c
2 parents 418f7e9 + 07339e2
commit 2fdc56c
Show file tree

Hide file tree

Showing 10 changed files with 8,102 additions and 15,393 deletions.
diff --git a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
@@ -31,6 +31,12 @@ def setUp(self):
 	def test_capitalization_with_perpetual_inventory(self):
 		company = "_Test Company with perpetual inventory"
 		set_depreciation_settings_in_company(company=company)
+		name = frappe.db.get_value(
+			"Asset Category Account",
+			filters={"parent": "Computers", "company_name": company},
+			fieldname=["name"],
+		)
+		frappe.db.set_value("Asset Category Account", name, "capital_work_in_progress_account", "")
 
 		# Variables
 		consumed_asset_value = 100000
@@ -215,6 +221,12 @@ def test_capitalization_with_periodical_inventory(self):
 	def test_capitalization_with_wip_composite_asset(self):
 		company = "_Test Company with perpetual inventory"
 		set_depreciation_settings_in_company(company=company)
+		name = frappe.db.get_value(
+			"Asset Category Account",
+			filters={"parent": "Computers", "company_name": company},
+			fieldname=["name"],
+		)
+		frappe.db.set_value("Asset Category Account", name, "capital_work_in_progress_account", "")
 
 		stock_rate = 1000
 		stock_qty = 2

diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po
diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po
diff --git a/erpnext/locale/de.po b/erpnext/locale/de.po
diff --git a/erpnext/locale/eo.po b/erpnext/locale/eo.po
diff --git a/erpnext/locale/es.po b/erpnext/locale/es.po
diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po
diff --git a/erpnext/locale/fr.po b/erpnext/locale/fr.po
diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po
diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po