diff --git a/changelog/58_UNRELEASED_2020-xx-xx.md b/changelog/58_UNRELEASED_2020-xx-xx.md
index 59d31c19..270d54a4 100644
--- a/changelog/58_UNRELEASED_2020-xx-xx.md
+++ b/changelog/58_UNRELEASED_2020-xx-xx.md
@@ -8,6 +8,7 @@
 ### Stock improvements/fixes
 - When creating a new product, the "QU id stock" is now preset by the "QU id purchase" (because most of the time that's most probably the same) (thanks @Mik-)
 - Clarified the row-button colors and toolips on the stock entries page
+- Fixed that the accumulated parent product amount (displayed on the stock overview page and on the product card) did not respect quantity unit conversions when the parent/sub products had different stock quantity units (the unit conversion needs to be globally defined, or as an override on the sub product)
 - Fixed the conversion factor hint to display also decimal places on the purchase page (only displayed when the product has a different purchase/stock quantity unit)
 - Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables"
 - Fixed that best before dates were displayed on the stock overview and stock entries page even with disabled `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING`
diff --git a/migrations/0100.sql b/migrations/0100.sql
new file mode 100644
index 00000000..4730c419
--- /dev/null
+++ b/migrations/0100.sql
@@ -0,0 +1,42 @@
+DROP VIEW stock_current;
+CREATE VIEW stock_current
+AS
+SELECT
+	pr.parent_product_id AS product_id,
+	IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = pr.parent_product_id), 0) AS amount,
+	SUM(s.amount) * IFNULL(qucr.factor, 1) AS amount_aggregated,
+	MIN(s.best_before_date) AS best_before_date,
+	IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = pr.parent_product_id AND open = 1), 0) AS amount_opened,
+	IFNULL((SELECT SUM(amount) FROM stock WHERE product_id IN (SELECT sub_product_id FROM products_resolved WHERE parent_product_id = pr.parent_product_id) AND open = 1), 0) * IFNULL(qucr.factor, 1) AS amount_opened_aggregated,
+	CASE WHEN p_sub.parent_product_id IS NOT NULL THEN 1 ELSE 0 END AS is_aggregated_amount
+FROM products_resolved pr
+JOIN stock s
+	ON pr.sub_product_id = s.product_id
+JOIN products p_parent
+	ON pr.parent_product_id = p_parent.id
+JOIN products p_sub
+	ON pr.sub_product_id = p_sub.id
+LEFT JOIN quantity_unit_conversions_resolved qucr
+	ON pr.sub_product_id = qucr.product_id
+	AND p_sub.qu_id_stock = qucr.from_qu_id
+	AND p_parent.qu_id_stock = qucr.to_qu_id
+GROUP BY pr.parent_product_id
+HAVING SUM(s.amount) > 0
+
+UNION
+
+-- This is the same as above but sub products not rolled up (no QU conversion and column is_aggregated_amount = 0 here)
+SELECT
+	pr.sub_product_id AS product_id,
+	SUM(s.amount) AS amount,
+	SUM(s.amount) AS amount_aggregated,
+	MIN(s.best_before_date) AS best_before_date,
+	IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = s.product_id AND open = 1), 0) AS amount_opened,
+	IFNULL((SELECT SUM(amount) FROM stock WHERE product_id = s.product_id AND open = 1), 0) AS amount_opened_aggregated,
+	0 AS is_aggregated_amount
+FROM products_resolved pr
+JOIN stock s
+	ON pr.sub_product_id = s.product_id
+WHERE pr.parent_product_id != pr.sub_product_id
+GROUP BY pr.sub_product_id
+HAVING SUM(s.amount) > 0;