mirror of
https://github.com/grocy/grocy.git
synced 2025-08-20 04:12:59 +00:00
Squashed commit
Improve journal pages loading time (new date range filter) Various small style adjustments (meal plan page and others) Pulled German translations from Transifex Show the shopping list total value (closes #1309) Make it possible to copy recipes (closes #714) Implemented optional "auto decimal separator for price inputs" (closes #1345) Removed table grouped column fixed order restriction (closes #1402) Don't filter out style, class, id attributes of html text (closes #1298) Added product picture as column on the stock overview page (closes #1283) Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
This commit is contained in:
@@ -33,7 +33,8 @@ SELECT
|
||||
p.description as product_description,
|
||||
l.name AS product_default_location_name,
|
||||
p_parent.id AS parent_product_id,
|
||||
p_parent.name AS parent_product_name
|
||||
p_parent.name AS parent_product_name,
|
||||
p.picture_file_name AS product_picture_file_name
|
||||
FROM (
|
||||
SELECT *
|
||||
FROM stock_current
|
||||
@@ -92,7 +93,8 @@ SELECT
|
||||
p.description AS product_description,
|
||||
l.name AS product_default_location_name,
|
||||
p_parent.id AS parent_product_id,
|
||||
p_parent.name AS parent_product_name
|
||||
p_parent.name AS parent_product_name,
|
||||
p.picture_file_name AS product_picture_file_name
|
||||
FROM (
|
||||
SELECT *
|
||||
FROM stock_current
|
||||
|
28
migrations/0147.sql
Normal file
28
migrations/0147.sql
Normal file
@@ -0,0 +1,28 @@
|
||||
DROP VIEW uihelper_stock_journal;
|
||||
CREATE VIEW uihelper_stock_journal
|
||||
AS
|
||||
SELECT
|
||||
sl.id,
|
||||
sl.row_created_timestamp,
|
||||
sl.correlation_id,
|
||||
sl.undone,
|
||||
sl.undone_timestamp,
|
||||
sl.transaction_type,
|
||||
sl.spoiled,
|
||||
sl.amount,
|
||||
sl.location_id,
|
||||
l.name AS location_name,
|
||||
p.name AS product_name,
|
||||
qu.name AS qu_name,
|
||||
qu.name_plural AS qu_name_plural,
|
||||
u.display_name AS user_display_name,
|
||||
p.id AS product_id
|
||||
FROM stock_log sl
|
||||
JOIN users_dto u
|
||||
ON sl.user_id = u.id
|
||||
JOIN products p
|
||||
ON sl.product_id = p.id
|
||||
JOIN locations l
|
||||
ON sl.location_id = l.id
|
||||
JOIN quantity_units qu
|
||||
ON p.qu_id_stock = qu.id;
|
Reference in New Issue
Block a user