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

Recipe edit page fixes

Browse Source
This commit is contained in:
Bernd Bestel 2020-11-13 15:46:44 +01:00
parent fa3a4ed688
commit ab68a51ba7
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
localization/strings.pot
View File

@ -1568,7 +1568,7 @@ msgstr ""
msgid "A purchased date is required" msgid "A purchased date is required"
msgstr "" msgstr ""
msgid "When a product is selected, one unit (per serving in purchase quantity unit) will be added to stock on consuming this recipe" msgid "When a product is selected, one unit (per serving in stock quantity unit) will be added to stock on consuming this recipe"
msgstr "" msgstr ""
msgid "Produces product" msgid "Produces product"

1
services/StockService.php
View File

@ -91,7 +91,6 @@ class StockService extends BaseService
// Tare weight handling // Tare weight handling
// The given amount is the new total amount including the container weight (gross) // The given amount is the new total amount including the container weight (gross)
// The amount to be posted needs to be the given amount - stock amount - tare weight // The amount to be posted needs to be the given amount - stock amount - tare weight
if ($productDetails->product->enable_tare_weight_handling == 1) if ($productDetails->product->enable_tare_weight_handling == 1)
{ {
if ($amount <= floatval($productDetails->product->tare_weight) + floatval($productDetails->stock_amount)) if ($amount <= floatval($productDetails->product->tare_weight) + floatval($productDetails->stock_amount))

3
views/recipeform.blade.php
View File

@ -92,7 +92,8 @@
'isRequired' => false, 'isRequired' => false,
'label' => 'Produces product', 'label' => 'Produces product',
'prefillById' => $mode == 'edit' ? $recipe->product_id : '', 'prefillById' => $mode == 'edit' ? $recipe->product_id : '',
'hint' => $__t('When a product is selected, one unit (per serving in purchase quantity unit) will be added to stock on consuming this recipe') 'hint' => $__t('When a product is selected, one unit (per serving in stock quantity unit) will be added to stock on consuming this recipe'),
'disallowAllProductWorkflows' => true,
)) ))
@include('components.userfieldsform', array( @include('components.userfieldsform', array(

2
views/recipeposform.blade.php
View File

@ -61,7 +61,7 @@
@include('components.productamountpicker', array( @include('components.productamountpicker', array(
'value' => $value, 'value' => $value,
'initialQuId' => $initialQuId, 'initialQuId' => $initialQuId,
'additionalGroupCssClasses' => 'mb-0' 'additionalGroupCssClasses' => 'mb-1'
)) ))
<div class="form-group"> <div class="form-group">