diff --git a/localization/strings.pot b/localization/strings.pot index 46dfcc81..30897797 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -2147,3 +2147,6 @@ msgstr "" msgid "Show only in-stock products" msgstr "" + +msgid "Product description" +msgstr "" diff --git a/migrations/0136.sql b/migrations/0136.sql index 3be82755..975e6cc2 100644 --- a/migrations/0136.sql +++ b/migrations/0136.sql @@ -29,7 +29,8 @@ SELECT plp.purchased_date AS last_purchased, plp.price AS last_price, p.min_stock_amount, - pbcs.barcodes AS product_barcodes + pbcs.barcodes AS product_barcodes, + p.description as product_description FROM ( SELECT * FROM stock_current @@ -80,7 +81,8 @@ SELECT plp.purchased_date AS last_purchased, plp.price AS last_price, p.min_stock_amount, - pbcs.barcodes AS product_barcodes + pbcs.barcodes AS product_barcodes, + p.description as product_description FROM ( SELECT * FROM stock_current diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 8316d182..7530b15d 100755 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -14,6 +14,7 @@ { 'visible': false, 'targets': 11 }, { 'visible': false, 'targets': 12 }, { 'visible': false, 'targets': 13 }, + { 'visible': false, 'targets': 14 }, { "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 e0caebc0..c274964c 100755 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -169,6 +169,7 @@ {{ $__t('Last purchased') }} {{ $__t('Last price') }} {{ $__t('Min. stock amount') }} + {{ $__t('Product description') }} @include('components.userfields_thead', array( 'userfields' => $userfields @@ -399,6 +400,9 @@ {{ $currentStockEntry->min_stock_amount }} + + {{ $currentStockEntry->product_description }} + @include('components.userfields_tbody', array( 'userfields' => $userfields,