kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables" (fixes #677)

Browse Source
This commit is contained in:
Bernd Bestel 2020-04-12 14:13:28 +02:00
parent 4e5e191b22
commit 390af436ab
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
- Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient - Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient
- Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel) - Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel)
- Fixed the conversion factor hint to display also decimal places on the purchase page (only displayed when the product has a different purchase/stock quantity unit) - Fixed the conversion factor hint to display also decimal places on the purchase page (only displayed when the product has a different purchase/stock quantity unit)
- Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables"
### Calendar fixes ### Calendar fixes
- Fixed that the "Share/Integrate calendar (iCal)" button did not work (thanks @tsia) - Fixed that the "Share/Integrate calendar (iCal)" button did not work (thanks @tsia)

3
localization/strings.pot
View File

@ -1777,6 +1777,3 @@ msgstr ""
msgid "Mark this stock entry as open" msgid "Mark this stock entry as open"
msgstr "" msgstr ""
msgid ""
msgstr ""

6
views/stockentries.blade.php
View File

@ -158,6 +158,12 @@
<span id="stock-{{ $stockEntry->id }}-purchased-date">{{ $stockEntry->purchased_date }}</span> <span id="stock-{{ $stockEntry->id }}-purchased-date">{{ $stockEntry->purchased_date }}</span>
<time id="stock-{{ $stockEntry->id }}-purchased-date-timeago" class="timeago timeago-contextual" datetime="{{ $stockEntry->purchased_date }} 23:59:59"></time> <time id="stock-{{ $stockEntry->id }}-purchased-date-timeago" class="timeago timeago-contextual" datetime="{{ $stockEntry->purchased_date }} 23:59:59"></time>
</td> </td>
@include('components.userfields_tbody', array(
'userfields' => $userfields,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $stockEntry->product_id)
))
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>