kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 10:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Added an status filter to only show in-stock products on the stock overview page (closes #1263)

Browse Source
This commit is contained in:
Bernd Bestel 2021-07-12 18:02:57 +02:00
parent 247221950d
commit 70433aace5
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@
- Product barcodes are now enforced to be unique across products - Product barcodes are now enforced to be unique across products
- On the stock overview page it's now also possible to search/filter by product barcodes (via the general search field) - On the stock overview page it's now also possible to search/filter by product barcodes (via the general search field)
- The product picker on the consume and transfer page now only shows products which are currently in stock - The product picker on the consume and transfer page now only shows products which are currently in stock
- Added a filter option to only show in-stock products on the products list page (master data) - Added a filter option to only show in-stock products on the stock overview and products list page (master data)
- Added new columns on the stock overview page (hidden by default): Product description, product default location, parent product - Added new columns on the stock overview page (hidden by default): Product description, product default location, parent product
- Optimized that when opening a product which has "Default due days after opened" set, the resulting date now never extends the original due date - Optimized that when opening a product which has "Default due days after opened" set, the resulting date now never extends the original due date
- Fixed that editing stock entries was not possible - Fixed that editing stock entries was not possible

3
localization/strings.pot
View File

@ -2166,3 +2166,6 @@ msgstr ""
msgid "When enabled, then this field must be filled on the destination form" msgid "When enabled, then this field must be filled on the destination form"
msgstr "" msgstr ""
msgid "In-stock products"
msgstr ""

4
views/stockoverview.blade.php
View File

@ -138,6 +138,7 @@
<option value="expired">{{ $__t('Expired') }}</option> <option value="expired">{{ $__t('Expired') }}</option>
@endif @endif
<option value="belowminstockamount">{{ $__t('Below min. stock amount') }}</option> <option value="belowminstockamount">{{ $__t('Below min. stock amount') }}</option>
<option value="instockX">{{ $__t('In-stock products') }}</option>
</select> </select>
</div> </div>
</div> </div>
@ -380,7 +381,8 @@
. ' days' . ' days'
)) ))
&& &&
$currentStockEntry->amount > 0) duesoon @elseif ($currentStockEntry->product_missing) belowminstockamount @endif" $currentStockEntry->amount > 0) duesoon @elseif ($currentStockEntry->product_missing) belowminstockamount @endif
@if($currentStockEntry->amount_aggregated > 0) instockX @endif
</td> </td>
<td class="d-none"> <td class="d-none">
xx{{ $currentStockEntry->product_group_name }}xx xx{{ $currentStockEntry->product_group_name }}xx