Commit Graph

314 Commits

Author SHA1 Message Date
Bernd Bestel 5dc745f301 Use the given time when skipping chores via /choretracking (references #1830) 2022-03-23 17:51:05 +01:00
Bernd Bestel bda230537a Fixed purchase/consume page handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #1829) 2022-03-23 17:35:06 +01:00
Bernd Bestel 1a82d0599c Use child product substitution on consuming during chore execution (fixes #1807) 2022-03-05 09:03:57 +01:00
Bernd Bestel e220b3e9f3 Fixed products product stock entry price (fixes #1791) 2022-02-19 09:03:42 +01:00
Bernd Bestel 66bd3f0d59 Added a new API endpoint to get all stock entries per location
References https://www.reddit.com/r/grocy/comments/srfwfs
2022-02-13 20:34:49 +01:00
Bernd Bestel 37744822d8 Handle not having any QU in LocalizationService (fixes #1783) 2022-02-12 22:31:35 +01:00
Bernd Bestel 1344e84534 Fixed recipe consume stock fulfillment checking (frontend and API) (fixes #1781) 2022-02-12 22:08:10 +01:00
Bernd Bestel 69a7ea6057 Added a new "adaptive" chore period type (closes #1495) 2022-02-10 18:06:33 +01:00
Bernd Bestel 7d4c9fefa9 Removed the dynamic regular chore period type (since it's the same as daily) 2022-02-09 20:25:16 +01:00
Bernd Bestel 10d7d44825 Added new hourly chore period type (closes #266) 2022-02-09 20:02:11 +01:00
Bernd Bestel 411dbabc90 Show the meal plan section for a meal plan entry types on the calendar (references #1582) 2022-02-08 19:09:17 +01:00
Bernd Bestel 66cf7e4ffa Squashed commit
Updated dependencies
Added the possibility to skip chore schedules (closes #1486)
Show the meal plan section on the corresponding calendar events (closes #1582)
Make it possible to define a time for meal plan sections and use that time for the corresponding calendar events (references #1582)
Added a changelog template
Make it possible to toggle the meal plan calendar view on bigger screens (closes #1678)
2022-02-08 18:08:26 +01:00
Bernd Bestel dd36301460 Use same plural definition for QU translator (references #1705) 2022-02-07 20:42:54 +01:00
Bernd Bestel d1d52aea44 Move FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT to per product option (closes #1753) 2022-02-07 19:12:31 +01:00
Bernd Bestel 12e5377c40 Split application translation strings and QU strings (fixes #1705) 2022-02-06 21:09:34 +01:00
Bernd Bestel aef646e9df Highlight chores/tasks/batteries due today in a separate color + status filter (closes #1740) 2022-01-23 17:42:55 +01:00
Bernd Bestel dfd6262f4a Fixed missing recipe ingredient amount when "Only check if any amount is in stock" is enabled and when there are unit conversions (fixes #1718) 2022-01-23 13:56:41 +01:00
Bernd Bestel c190002ebb More recipes page performance optimizations (references #1750) 2022-01-16 16:08:57 +01:00
Bernd Bestel 8ec0d9319b Exclude tasks without an due date from the iCal export (fixes #1745) 2022-01-11 20:54:23 +01:00
Bernd Bestel c1952e98bc Show stock journal entries of deleted users / fixed default user handling (fixes #1725) 2022-01-06 15:14:32 +01:00
Bernd Bestel 3a6f04f770 Optionally remove only done shopping list items (/stock/shoppinglist/clear API endpoint, closes #1730) 2022-01-06 14:07:29 +01:00
Bernd Bestel ad0dbdfc22 Lookup product barcodes case insensitive (fixes #1734) 2022-01-06 13:42:38 +01:00
Bernd Bestel a711bbd8f6 Print stock entry labels also on inventory when adding products (closes #1713) 2021-12-09 18:32:59 +01:00
Bernd Bestel b83e4f53b1 Don't print stock entry labels when not desired (server side WebHook execution) (references #1686) 2021-11-15 09:06:19 +01:00
Bernd Bestel 4d21668265 Added the possibility to merge chores 2021-11-14 16:19:52 +01:00
Bernd Bestel 6070507b04 Fixed per unit stock grocycodes weren't unique per unit (fixes #1676) 2021-11-14 15:26:38 +01:00
Graham Christensen a7f3f64d89 StockService: Set the product's bestBeforeDate to the freezer date if it is being purchased to a freezer (#1672)
* StockService: Set the product's bestBeforeDate to the freezer date if it is being purchased to a freezer

* Formatting / feature flag checks / proper data type comparision

* Prefill due date also on location change

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-11-13 17:41:04 +01:00
Bernd Bestel 4338ccc132 Restore the original due date when undoing a product opened transaction (fixes #1659) 2021-11-12 18:12:34 +01:00
Bernd Bestel 282168f92c Potentially fix a type mismatch problem (fixes #1629) 2021-09-29 09:21:45 +02:00
Bernd Bestel bed7965989 Fixed undo consume stock transaction location handling (references #1602) 2021-09-27 17:50:19 +02:00
Bernd Bestel 19ff782c00 Fixed consume transaction journal location handling (fixes #1602) 2021-09-27 17:46:42 +02:00
Bernd Bestel c06bb7784a Include OS and client information in easy error info copy/paste and on the about dialog 2021-09-20 20:16:41 +02:00
Bernd Bestel 616e1dd5d7 Fixed negative number plural form handling (fixes #1601) 2021-09-06 22:26:31 +02:00
Bernd Bestel 1d5ca5ed64 Fixed external barcode lookup (plugin) add product handling related to barcodes (fixes #1568) 2021-08-19 19:56:43 +02:00
Bernd Bestel cebf7a3e54 Don't consider inactive products to be missing (fixes #1578) 2021-08-17 18:00:33 +02:00
David Mott 95cb9ffb90 fix: confirm grocycode is of PRODUCT type in GetProductIdFromBarcode (#1581)
* fix: confirm grocycode is of PRODUCT type in GetProductIdFromBarcode

* Fixed formatting

* Don't output the given input (for security reasons)

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-08-15 10:45:05 +02:00
Bernd Bestel edfa404ed6 Squashed commit
Always execute migration 9999 (can be used to fix things manually)
Optimized meal plan navigation / date range filtering
Prepared next release
Pulled translations from Transifex
Various code optimizations
2021-07-16 17:32:08 +02:00
Bernd Bestel 2d2700cacb Implemented meal plan sections (closes #370) 2021-07-15 17:54:48 +02:00
Bernd Bestel f6986fac18 Fixed cost/calories calculation for nested recipes (references #1264) 2021-07-14 16:27:03 +02:00
Bernd Bestel 91d8eaeb74 Squashed commit
Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
2021-07-13 19:29:23 +02:00
Bernd Bestel 247221950d Never extend the original due date on when opening a product which has default_best_before_days (closes #1342) 2021-07-12 17:56:09 +02:00
Bernd Bestel 55807bfc94 Auto-compact stock entries (closes #1343) 2021-07-11 21:06:05 +02:00
Bernd Bestel 198216f38b Make it possible to track any information on chore execution (by using Userfields, closes #825) 2021-07-11 19:44:06 +02:00
Bernd Bestel 40e16db01f Fixed consume amount validation when consuming a parent product (fixes #1306)
More a workaround for now, the max constraint is just removed when the product has child products,
but the amount to be consumed is checked by StockService anyway, so should not be a problem...
2021-07-11 10:21:36 +02:00
Bernd Bestel 7ee15946c7 Improved page loading time of /recipes and /mealplan when having a big meal plan (closes #695) 2021-07-10 22:56:39 +02:00
Bernd Bestel 9b37c450ed Fixed API error when adding missing products to the shopping list from a meal plan entry (references #https://github.com/grocy/grocy/commit/b0d38b87de07f4ae117dd7e8e437aac2e8d842b1) 2021-07-10 19:56:35 +02:00
Bernd Bestel 90a0caf1dc Fixed meal plan recipe servings stock fulfillment checking (fixes #1391) 2021-07-10 12:32:29 +02:00
Bernd Bestel 7595d640f5 Return empty Userfields empty (closes #1412) 2021-07-08 20:12:58 +02:00
Bernd Bestel 633b26bf7e Add recipe ingredient notes to the corresponding shopping list item (closes #1397) 2021-07-06 20:19:50 +02:00
Bernd Bestel aaa054e0a5 Also return the next_execution_assigned_user for the /chores API endpoint (closes #1493)
Include the user and category object for the /tasks API endpoint (closes #1494)
2021-07-06 19:07:45 +02:00