kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Relate prices on the shopping to the there selected QU (closes #2294)

Browse Source
This commit is contained in:
Bernd Bestel
2023-08-06 14:31:38 +02:00
parent ee4a082c74
commit 7ef744a995
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/71_UNRELEASED_xxxx-xx-xx.md
View File

@@ -16,7 +16,7 @@
### Shopping list
- xxx
- Changed that prices on the shopping list (table columns "Last price (Unit)" and "Last price (Total)") are now related to the selected quantity unit (instead of to the product's QU stock as before)
### Recipes

8
migrations/0226.sql
View File

@@ -163,8 +163,8 @@ AS
SELECT
sl.*,
p.name AS product_name,
plp.price AS last_price_unit,
plp.price * sl.amount AS last_price_total,
plp.price * IFNULL(quc.factor, 1.0) AS last_price_unit,
plp.price * (sl.amount / IFNULL(quc.factor, 1.0)) * IFNULL(quc.factor, 1.0) AS last_price_total,
st.name AS default_shopping_location_name,
qu.name AS qu_name,
qu.name_plural AS qu_name_plural,
@@ -182,6 +182,10 @@ LEFT JOIN quantity_units qu
ON sl.qu_id = qu.id
LEFT JOIN product_groups pg
ON p.product_group_id = pg.id
LEFT JOIN cache__quantity_unit_conversions_resolved quc
ON p.id = quc.product_id
AND sl.qu_id = quc.from_qu_id
AND p.qu_id_stock = quc.to_qu_id
LEFT JOIN product_barcodes_comma_separated pbcs
ON sl.product_id = pbcs.product_id;