Support indirect QU conversions (fixes #1217)

changelog/61_UNRELEASED_xxxx-xx-xx.md

@@ -8,5 +8,6 @@
 - Added validation checks for most `data/config.php` settings to prevent using invalid ones (thanks @Forceu)
 - Fixed that some number inputs were broken when the new decimal places setting were set to `0`
 - Fixed that browser camera barcode scanning did not work on the product edit page for adding product barcodes
+- Fixed that indirect unit conversions (those between units, not product overrides) could not be used/selected
 - Fixed that the new product option "Never show on stock overview" was unintentionally set by default for new products
 - Fixed that the success message on purchase displayed no amount when `FEATURE_FLAG_STOCK_PRICE_TRACKING` was disabled

migrations/0126.sql

@@ -0,0 +1,153 @@
+CREATE VIEW quantity_units_resolved
+AS
+-- This view builds the relationship between QUs based on their (default) conversions
+
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	qu.id AS qu_id,
+	quc.to_qu_id AS related_qu_id,
+	quc.factor
+FROM quantity_units qu
+JOIN quantity_unit_conversions quc
+	ON qu.id = quc.from_qu_id
+	AND quc.product_id IS NULL;
+
+CREATE VIEW product_qu_relations
+AS
+-- This view builds which product is related to which QU, direct or indirect, based on QU conversions
+
+-- The products stock QU
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	p.qu_id_stock AS qu_id
+FROM products p
+
+UNION
+
+-- The products purchase QU
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	p.qu_id_purchase AS qu_id
+FROM products p
+
+UNION
+
+-- All (direct) product conversions (product overrides)
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	quc.product_id,
+	quc.to_qu_id AS qu_id
+FROM quantity_unit_conversions quc
+WHERE quc.product_id IS NOT NULL
+
+UNION
+
+-- All (indirect) default QU conversions
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	qur2.qu_id
+from products p
+JOIN quantity_unit_conversions quc
+	ON (p.qu_id_stock = quc.from_qu_id OR p.qu_id_purchase = quc.from_qu_id)
+	AND p.id = quc.product_id
+JOIN quantity_units_resolved qur1
+	ON quc.to_qu_id = qur1.qu_id
+JOIN quantity_units_resolved qur2
+	ON qur1.related_qu_id = qur2.qu_id;
+
+DROP VIEW quantity_unit_conversions_resolved;
+CREATE VIEW quantity_unit_conversions_resolved
+AS
+
+-- 1. Product "purchase to stock" conversion factor
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	p.qu_id_purchase AS from_qu_id,
+	qu_from.name AS from_qu_name,
+	p.qu_id_stock AS to_qu_id,
+	qu_to.name AS to_qu_name,
+	p.qu_factor_purchase_to_stock AS factor
+FROM products p
+JOIN quantity_units qu_from
+	ON p.qu_id_purchase = qu_from.id
+JOIN quantity_units qu_to
+	ON p.qu_id_stock = qu_to.id
+UNION -- Inversed
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	p.qu_id_stock AS from_qu_id,
+	qu_to.name AS from_qu_name,
+	p.qu_id_purchase AS to_qu_id,
+	qu_from.name AS to_qu_name,
+	1 / p.qu_factor_purchase_to_stock AS factor
+FROM products p
+JOIN quantity_units qu_from
+	ON p.qu_id_purchase = qu_from.id
+JOIN quantity_units qu_to
+	ON p.qu_id_stock = qu_to.id
+
+UNION
+
+-- 2. Product specific QU overrides
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	quc.from_qu_id AS from_qu_id,
+	qu_from.name AS from_qu_name,
+	quc.to_qu_id AS to_qu_id,
+	qu_to.name AS to_qu_name,
+	quc.factor AS factor
+FROM products p
+JOIN quantity_unit_conversions quc
+	ON p.id = quc.product_id
+JOIN quantity_units qu_from
+	ON quc.from_qu_id = qu_from.id
+JOIN quantity_units qu_to
+	ON quc.to_qu_id = qu_to.id
+
+UNION
+
+-- 3. Default (direct) QU conversion factors
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	p.qu_id_stock AS from_qu_id,
+	qu_from.name AS from_qu_name,
+	quc.to_qu_id AS to_qu_id,
+	qu_to.name AS to_qu_name,
+	quc.factor AS factor
+FROM products p
+JOIN quantity_unit_conversions quc
+	ON p.qu_id_stock = quc.from_qu_id
+	AND quc.product_id IS NULL
+JOIN quantity_units qu_from
+	ON quc.from_qu_id = qu_from.id
+JOIN quantity_units qu_to
+	ON quc.to_qu_id = qu_to.id
+
+UNION
+
+-- 4. Default (indirect) QU conversion factors
+SELECT
+	-1 AS id, -- Dummy, LessQL needs an id column
+	p.id AS product_id,
+	(SELECT from_qu_id FROM quantity_unit_conversions WHERE to_qu_id = quc.to_qu_id AND product_id = p.id) AS from_qu_id,
+	qu_from.name AS from_qu_name,
+	quc.from_qu_id AS to_qu_id,
+	qu_to.name AS to_qu_name,
+	quc.factor * (SELECT factor FROM quantity_unit_conversions WHERE to_qu_id = quc.to_qu_id AND product_id = p.id) AS factor
+FROM products p
+JOIN product_qu_relations pqr
+	ON p.id = pqr.product_id
+JOIN quantity_unit_conversions quc
+	ON pqr.qu_id = quc.from_qu_id
+	AND quc.product_id IS NULL
+JOIN quantity_units qu_from
+	ON (SELECT from_qu_id FROM quantity_unit_conversions WHERE to_qu_id = quc.to_qu_id AND product_id = p.id) = qu_from.id
+JOIN quantity_units qu_to
+	ON quc.from_qu_id = qu_to.id;

public/viewjs/components/productamountpicker.js

@@ -106,7 +106,7 @@ $(".input-group-productamountpicker").on("change", function()
 		$("#qu-conversion-info").text(__t("This equals %1$s %2$s", destinationAmount.toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }), destinationQuName));
 	}
 
-	$("#amount").val(destinationAmount.toFixed(4).replace(/0*$/g, ''));
+	$("#amount").val(destinationAmount.toFixed(Grocy.UserSettings.stock_decimal_places_amounts).replace(/0*$/g, ''));
 });
 
 $("#display_amount").on("keyup", function()