diff --git a/changelog/65_UNRELEASED_xxxx-xx-xx.md b/changelog/65_UNRELEASED_xxxx-xx-xx.md
index f1837a38..09ecd6f3 100644
--- a/changelog/65_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/65_UNRELEASED_xxxx-xx-xx.md
@@ -1,5 +1,6 @@
- The "Below min. stock amount" filter on the stock overview page now also includes due-soon, overdue or already expired products
- The default shopping list (named "Shopping list"; localized) can now be renamed
+- Added the products average price as a (hidden by default) column on the stock overview page
- Fixed that the "Stay logged in permanently" checkbox on the login page had no effect (thanks @0)
- Fixed that the labels of context-/more-menu items were not readable in Night Mode (thanks @corbolais)
- Fixed that auto night mode over midnight did not always work
diff --git a/migrations/0153.sql b/migrations/0153.sql
new file mode 100644
index 00000000..41ee1ad1
--- /dev/null
+++ b/migrations/0153.sql
@@ -0,0 +1,125 @@
+DROP VIEW uihelper_stock_current_overview_including_opened;
+CREATE VIEW uihelper_stock_current_overview_including_opened
+AS
+SELECT
+ p.id,
+ sc.amount_opened AS amount_opened,
+ p.tare_weight AS tare_weight,
+ p.enable_tare_weight_handling AS enable_tare_weight_handling,
+ sc.amount AS amount,
+ sc.value as value,
+ sc.product_id AS product_id,
+ sc.best_before_date AS best_before_date,
+ EXISTS(SELECT id FROM stock_missing_products_including_opened WHERE id = sc.product_id) AS product_missing,
+ (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name,
+ (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name_plural,
+ p.name AS product_name,
+ (SELECT name FROM product_groups WHERE product_groups.id = p.product_group_id) AS product_group_name,
+ EXISTS(SELECT * FROM shopping_list WHERE shopping_list.product_id = sc.product_id) AS on_shopping_list,
+ (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name,
+ (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name_plural,
+ sc.is_aggregated_amount,
+ sc.amount_opened_aggregated,
+ sc.amount_aggregated,
+ p.calories AS product_calories,
+ sc.amount * p.calories AS calories,
+ sc.amount_aggregated * p.calories AS calories_aggregated,
+ p.quick_consume_amount,
+ p.due_type,
+ plp.purchased_date AS last_purchased,
+ plp.price AS last_price,
+ pap.price as average_price,
+ p.min_stock_amount,
+ pbcs.barcodes AS product_barcodes,
+ 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.picture_file_name AS product_picture_file_name
+FROM (
+ SELECT *
+ FROM stock_current
+ WHERE best_before_date IS NOT NULL
+ UNION
+ SELECT m.id, 0, 0, 0, null, 0, 0, 0, p.due_type
+ FROM stock_missing_products_including_opened m
+ JOIN products p
+ ON m.id = p.id
+ WHERE m.id NOT IN (SELECT product_id FROM stock_current)
+ ) sc
+LEFT JOIN products_last_purchased plp
+ ON sc.product_id = plp.product_id
+LEFT JOIN products_average_price pap
+ ON sc.product_id = pap.product_id
+LEFT JOIN products p
+ ON sc.product_id = p.id
+LEFT JOIN product_barcodes_comma_separated pbcs
+ ON sc.product_id = pbcs.product_id
+LEFT JOIN products p_parent
+ ON p.parent_product_id = p_parent.id
+LEFT JOIN locations l
+ ON p.location_id = l.id
+WHERE p.hide_on_stock_overview = 0;
+
+DROP VIEW uihelper_stock_current_overview;
+CREATE VIEW uihelper_stock_current_overview
+AS
+SELECT
+ p.id,
+ sc.amount_opened AS amount_opened,
+ p.tare_weight AS tare_weight,
+ p.enable_tare_weight_handling AS enable_tare_weight_handling,
+ sc.amount AS amount,
+ sc.value as value,
+ sc.product_id AS product_id,
+ sc.best_before_date AS best_before_date,
+ EXISTS(SELECT id FROM stock_missing_products WHERE id = sc.product_id) AS product_missing,
+ (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name,
+ (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name_plural,
+ p.name AS product_name,
+ (SELECT name FROM product_groups WHERE product_groups.id = p.product_group_id) AS product_group_name,
+ EXISTS(SELECT * FROM shopping_list WHERE shopping_list.product_id = sc.product_id) AS on_shopping_list,
+ (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name,
+ (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name_plural,
+ sc.is_aggregated_amount,
+ sc.amount_opened_aggregated,
+ sc.amount_aggregated,
+ p.calories AS product_calories,
+ sc.amount * p.calories AS calories,
+ sc.amount_aggregated * p.calories AS calories_aggregated,
+ p.quick_consume_amount,
+ p.due_type,
+ plp.purchased_date AS last_purchased,
+ plp.price AS last_price,
+ pap.price as average_price,
+ p.min_stock_amount,
+ pbcs.barcodes AS product_barcodes,
+ 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.picture_file_name AS product_picture_file_name
+FROM (
+ SELECT *
+ FROM stock_current
+ WHERE best_before_date IS NOT NULL
+ UNION
+ SELECT m.id, 0, 0, 0, null, 0, 0, 0, p.due_type
+ FROM stock_missing_products m
+ JOIN products p
+ ON m.id = p.id
+ WHERE m.id NOT IN (SELECT product_id FROM stock_current)
+ ) sc
+LEFT JOIN products_last_purchased plp
+ ON sc.product_id = plp.product_id
+LEFT JOIN products_average_price pap
+ ON sc.product_id = pap.product_id
+LEFT JOIN products p
+ ON sc.product_id = p.id
+LEFT JOIN product_barcodes_comma_separated pbcs
+ ON sc.product_id = pbcs.product_id
+LEFT JOIN products p_parent
+ ON p.parent_product_id = p_parent.id
+LEFT JOIN locations l
+ ON p.location_id = l.id
+WHERE p.hide_on_stock_overview = 0;
diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js
index a2242dfd..95c6d3a3 100755
--- a/public/viewjs/stockoverview.js
+++ b/public/viewjs/stockoverview.js
@@ -18,6 +18,7 @@
{ 'visible': false, 'targets': 15 },
{ 'visible': false, 'targets': 16 },
{ 'visible': false, 'targets': 17 },
+ { 'visible': false, 'targets': 18 },
{ "type": "num", "targets": 3 },
{ "type": "html-num-fmt", "targets": 9 },
{ "type": "html-num-fmt", "targets": 10 },
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index a5cfacb9..da4103d9 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -174,6 +174,7 @@
| {{ $__t('Parent product') }} |
{{ $__t('Default location') }} |
{{ $__t('Product picture') }} |
+ {{ $__t('Average price') }} |
@include('components.userfields_thead', array(
'userfields' => $userfields
@@ -414,6 +415,9 @@
class="lazy">
@endif
+
+ {{ $currentStockEntry->average_price }}
+ |
@include('components.userfields_tbody', array(
'userfields' => $userfields,