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

Use child product substitution on consuming during chore execution (fixes #1807)

Browse Source
This commit is contained in:
Bernd Bestel 2022-03-05 09:03:57 +01:00
parent 620f938065
commit 1a82d0599c
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/67_UNRELEASED_xxxx-xx-xx.md
View File

@ -29,6 +29,7 @@
- The `Daily` period type has been changed to schedule the chore at the _same time_ (based on the start date) each `n` days - The `Daily` period type has been changed to schedule the chore at the _same time_ (based on the start date) each `n` days
- This period type scheduled chores `n` days _after the last execution_ before, which is also possible by using the `Hourly` period type and a corresponding period interval; all existing `Daily` schedules will be converted to that on migration - This period type scheduled chores `n` days _after the last execution_ before, which is also possible by using the `Hourly` period type and a corresponding period interval; all existing `Daily` schedules will be converted to that on migration
- Fixed that when consuming a parent product on chore execution (chore option "Consume product on chore execution"), no child products were used if the parent product itself is not in-stock
### Calendar ### Calendar

3
services/ChoresService.php
View File

@ -203,7 +203,8 @@ class ChoresService extends BaseService
if ($chore->consume_product_on_execution == 1 && !empty($chore->product_id)) if ($chore->consume_product_on_execution == 1 && !empty($chore->product_id))
{ {
$this->getStockService()->ConsumeProduct($chore->product_id, $chore->product_amount, false, StockService::TRANSACTION_TYPE_CONSUME); $transactionId = uniqid();
$this->getStockService()->ConsumeProduct($chore->product_id, $chore->product_amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', null, null, $transactionId, true);
} }
return $lastInsertId; return $lastInsertId;