kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-31 18:49:38 +00:00
Code Issues Projects Releases Wiki Activity

Show if a consume booking was spoiled on the stock journal page (closes #953)

Browse Source
This commit is contained in:
Bernd Bestel
2020-08-25 19:51:54 +02:00
parent 71a6cbef2d
commit 0417b73cb5
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/60_UNRELEASED_2020-xx-xx.md
View File

@@ -18,6 +18,7 @@
- Changed that when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is disabled, products now get internally a best before of "never expires" (aka `2999-12-31`) instead of today (thanks @kriddles) - Changed that when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is disabled, products now get internally a best before of "never expires" (aka `2999-12-31`) instead of today (thanks @kriddles)
- Products can now be hidden instead of deleted to prevent problems / missing information on existing references (new checkbox on the product edit page) (thanks @kriddles) - Products can now be hidden instead of deleted to prevent problems / missing information on existing references (new checkbox on the product edit page) (thanks @kriddles)
- Improved/fixed that changing the products "Factor purchase to stock quantity unit" not longer messes up historical prices (which results for example in wrong recipe costs) (thanks @kriddles) - Improved/fixed that changing the products "Factor purchase to stock quantity unit" not longer messes up historical prices (which results for example in wrong recipe costs) (thanks @kriddles)
- On the stock journal page, it's now visible if a consume-booking was spoiled
- Fixed that it was not possible to leave the "Barcode(s)" on the product edit page by `TAB` - Fixed that it was not possible to leave the "Barcode(s)" on the product edit page by `TAB`
- Fixed that when adding products through a product picker workflow and when the created products contains special characters, the product was not preselected on the previous page (thanks @Forceu) - Fixed that when adding products through a product picker workflow and when the created products contains special characters, the product was not preselected on the previous page (thanks @Forceu)
- Fixed that when editing a product the default store was not visible / always empty regardless if the product had one set (thanks @kriddles) - Fixed that when editing a product the default store was not visible / always empty regardless if the product had one set (thanks @kriddles)

3
views/stockjournal.blade.php
View File

@@ -74,6 +74,9 @@
</td> </td>
<td> <td>
{{ $__t($stockLogEntry->transaction_type) }} {{ $__t($stockLogEntry->transaction_type) }}
@if ($stockLogEntry->spoiled == 1)
<span class="font-italic text-muted">{{ $__t('Spoiled') }}</span>
@endif
</td> </td>
<td class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif"> <td class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif">
{{ FindObjectInArrayByPropertyValue($locations, 'id', $stockLogEntry->location_id)->name }} {{ FindObjectInArrayByPropertyValue($locations, 'id', $stockLogEntry->location_id)->name }}