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

Fixed consume transaction journal location handling (fixes #1602)

Browse Source
This commit is contained in:
Bernd Bestel 2021-09-27 17:46:42 +02:00
parent cebb368a28
commit 19ff782c00
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/64_UNRELEASED_xxxx.xx.xx.md
View File

@ -2,6 +2,7 @@
- Fixed that plural form handling (e.g. for quantity units) was wrong for negative numbers - Fixed that plural form handling (e.g. for quantity units) was wrong for negative numbers
- Fixed that the context menu entries Consume and Transfer on the stock overview page were disabled when the amount in stock was < 1 - Fixed that the context menu entries Consume and Transfer on the stock overview page were disabled when the amount in stock was < 1
- Fixed that when there was any chore with a schedule, but without a "next estimated tracking" date/time, the iCal export was broken - Fixed that when there was any chore with a schedule, but without a "next estimated tracking" date/time, the iCal export was broken
- Fixed that on consuming a product from not the products default location, the products default location was recorded in the stock journal
- The product and chore edit pages now have bottom-sticky save buttons - The product and chore edit pages now have bottom-sticky save buttons
- A product picture can now be added when creating a product (was currently only possible when editing a product) - A product picture can now be added when creating a product (was currently only possible when editing a product)

6
services/StockService.php
View File

@ -379,7 +379,8 @@ class StockService extends BaseService
'opened_date' => $stockEntry->opened_date, 'opened_date' => $stockEntry->opened_date,
'recipe_id' => $recipeId, 'recipe_id' => $recipeId,
'transaction_id' => $transactionId, 'transaction_id' => $transactionId,
'user_id' => GROCY_USER_ID 'user_id' => GROCY_USER_ID,
'location_id' => $stockEntry->location_id
]); ]);
$logRow->save(); $logRow->save();
@ -405,7 +406,8 @@ class StockService extends BaseService
'opened_date' => $stockEntry->opened_date, 'opened_date' => $stockEntry->opened_date,
'recipe_id' => $recipeId, 'recipe_id' => $recipeId,
'transaction_id' => $transactionId, 'transaction_id' => $transactionId,
'user_id' => GROCY_USER_ID 'user_id' => GROCY_USER_ID,
'location_id' => $stockEntry->location_id
]); ]);
$logRow->save(); $logRow->save();