mirror of
https://github.com/grocy/grocy.git
synced 2025-08-20 20:26:42 +00:00
Fixed shopping list unit/total price QU handling (fixes #1460)
This commit is contained in:
@@ -40,6 +40,7 @@
|
|||||||
- Fixed that shopping list prints had a grey background (thanks @Forceu)
|
- Fixed that shopping list prints had a grey background (thanks @Forceu)
|
||||||
- Fixed the form validation on the shopping list item page (thanks @Forceu)
|
- Fixed the form validation on the shopping list item page (thanks @Forceu)
|
||||||
- Fixed that when adding products to the shopping list from the stock overview page, the used quantity unit was always the products default purchase QU (and not the selected one)
|
- Fixed that when adding products to the shopping list from the stock overview page, the used quantity unit was always the products default purchase QU (and not the selected one)
|
||||||
|
- Fixed that the displayed last unit/total price was wrong when the used quantity unit was not the products stock QU
|
||||||
|
|
||||||
### Recipe improvements/fixes
|
### Recipe improvements/fixes
|
||||||
- Recipe printing improvements (thanks @Ape)
|
- Recipe printing improvements (thanks @Ape)
|
||||||
|
26
migrations/0134.sql
Normal file
26
migrations/0134.sql
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
DROP VIEW uihelper_shopping_list;
|
||||||
|
CREATE VIEW uihelper_shopping_list
|
||||||
|
AS
|
||||||
|
SELECT
|
||||||
|
sl.*,
|
||||||
|
p.name AS product_name,
|
||||||
|
plp.price AS last_price_unit,
|
||||||
|
plp.price * sl.amount AS last_price_total,
|
||||||
|
st.name AS default_shopping_location_name,
|
||||||
|
qu.name AS qu_name,
|
||||||
|
qu.name_plural AS qu_name_plural,
|
||||||
|
pg.name AS product_group_name,
|
||||||
|
pbcs.barcodes AS product_barcodes
|
||||||
|
FROM shopping_list sl
|
||||||
|
LEFT JOIN products p
|
||||||
|
ON sl.product_id = p.id
|
||||||
|
LEFT JOIN products_last_purchased plp
|
||||||
|
ON sl.product_id = plp.product_id
|
||||||
|
LEFT JOIN shopping_locations st
|
||||||
|
ON p.shopping_location_id = st.id
|
||||||
|
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 product_barcodes_comma_separated pbcs
|
||||||
|
ON sl.product_id = pbcs.product_id;
|
Reference in New Issue
Block a user