kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 11:48:55 +00:00
Code Issues Projects Releases Wiki Activity
2,022 Commits 2 Branches 80 Tags
fd7a4e02bef653a9aed8d3f16e1e39eea84a3d0a
Commit Graph

272 Commits

Author SHA1 Message Date
Bernd Bestel
3b8944d61b Fixed recipes_pos_resolved.missing_amount calculation (references #1903) 2022-06-01 20:32:31 +02:00
Bernd Bestel
e757cab0da Fixed recipe ingredient costs/calories when using substituted product with unit conversions (fixes #1903) 2022-05-29 22:48:48 +02:00
Rosemary Orchard
5e30e89737 Add support for "Move on Open" (#1863) 
* Add functionality to move a product when it is opened

* Update the API to support this (and some other new fields)

* Remove console, update move on open when either the default or the consume location change

* Fix conflict from fridge

* Ignore .DS_STORE from macOS

* Fix the migration conflict

* Fix the default location not appending properly

* Revert changes no longer needed

* Fix the checkbox disable logic, and call the function on page load

* Simplify the transfer to use the existing function (which also adds logs)

* Only move it if it's moving

* Code formatting / naming

* Clarify help text (it's not always about one unit, but about the corresponding amount opened)

* Handle splitted stock entries + optimized/unified product property checks

* Added UI feedback on auto moving

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2022-04-18 18:25:08 +02:00
Bernd Bestel
0152f1c69d Fixed typo 2022-04-17 21:32:54 +02:00
Bernd Bestel
00ac935367 Enforce a conversion factor of 1 between QU stock/purchase when they are the same (references #1862) 2022-04-17 21:28:58 +02:00
Bernd Bestel
35474f2466 Improved QU conversion validation messages (references #1844) 2022-04-07 18:12:02 +02:00
Bernd Bestel
ca77ba6d19 Improved QU conversion validation messages (references #1844) 2022-04-07 07:26:06 +02:00
Bernd Bestel
6ecf94073d Automatically create/update/delete inverse QU conversions (closes #1844) 2022-04-06 22:21:21 +02:00
Bernd Bestel
4da546fc80 Don't compact stock entries with userfields 2022-04-06 19:07:33 +02:00
Bernd Bestel
03bba4b9e5 Fixed "Search for recipes containing this product" (fixes #1842) 2022-04-05 18:21:25 +02:00
Bernd Bestel
61ed756dd0 Implemented "default consume location" handling (closes #1365) 2022-04-03 21:15:05 +02:00
Bernd Bestel
97626b4a59 Added userfield default values for userfield types date & datetime (closes #1166) 2022-04-03 14:32:31 +02:00
Bernd Bestel
3efecb8bed Make it possible to manually re-assign chores (closes #1492, references #1830) 2022-04-03 13:56:14 +02:00
Bernd Bestel
2042db29ee Use prefers-color-scheme for night mode by default (closes #1334) 2022-04-02 19:26:55 +02:00
Bernd Bestel
3e4f2eaf5d Delete userfield values when deleting a product/chore/battery/userfield (closes #1632) 2022-04-02 18:05:54 +02:00
Bernd Bestel
6a50f74a14 Optimizations regarding displaying prices (closes #1743) 2022-04-02 17:49:35 +02:00
Bernd Bestel
7ad979cba9 Also convert prices when changing a products stock QU (references #1326) 2022-04-02 16:00:47 +02:00
Bernd Bestel
a5ff947936 Show the substituted product for parent product ingredients currently not in-stock (closes #1797) 2022-04-02 11:54:07 +02:00
Bernd Bestel
ebfc55064e Prevent adding "Disable own stock"-products to stock (references #564) 2022-04-01 19:52:43 +02:00
Bernd Bestel
ccc59dfc8b Added a new product option "Disable own stock" (closes #564) 2022-04-01 18:49:17 +02:00
Bernd Bestel
b53d1a076f Reviewed latest changes regarding price handling views 2022-04-01 17:04:09 +02:00
Bernd Bestel
cd60c239af Squashed commit 
Improved locale number display on stockoverview page
Fixed choresoverview chore execution color highlighting
Highlight recipe ingredients based on the new due score (references #1813)
Reworked current price handling views (mostly needed for recipes)
 2022-03-31 22:52:38 +02:00
Bernd Bestel
d3a39270de Implemented notes and Userfields for stock entries (closes #443) 2022-03-30 17:32:53 +02:00
Bernd Bestel
8e68477a78 Implemented a "recipes due score" (closes #1813) 2022-03-29 20:38:26 +02:00
Bernd Bestel
d65734c896 Added the possibility to manually reschedule chores (closes #1830) 2022-03-26 18:30:26 +01:00
Bernd Bestel
00466972e2 Typo 2022-03-23 17:36:36 +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
dce14b8999 Fixed chore upgrade handling when having nonsensical user data (fixes #1826) 2022-03-23 17:17:39 +01:00
Bernd Bestel
7ea9984fd3 Make it possible to change a products stock QU after it was once added to stock (closes #1326) 2022-03-13 17:09:07 +01:00
Bernd Bestel
620f938065 Fixed multi-nested recipe serving amount calculation (fixes #1806) 2022-03-03 17:38:51 +01:00
Bernd Bestel
45d1c87975 Fixed "Treat opened as out of stock" missing stock amount handling (fixes #1804) 2022-03-01 18:02:04 +01:00
Bernd Bestel
bab0e1d5fb Fixed battery charge cycle undo handling (fixes #1800) 2022-02-26 17:38:58 +01:00
Bernd Bestel
5bfdddd52b Delete QU conversions when deleting QU (theoretical problem, closes #1796) 2022-02-20 19:18:10 +01:00
Bernd Bestel
777fcbae77 Use products stock QU for product_barcodes when empty (references #1794) 2022-02-20 17:07:22 +01:00
Bernd Bestel
1aa7db9c2a Added an daily-same-time chore period type (closes #1793) 2022-02-20 16:03:50 +01:00
Bernd Bestel
e220b3e9f3 Fixed products product stock entry price (fixes #1791) 2022-02-19 09:03:42 +01:00
Bernd Bestel
88452a187c Fixed column selection of ix_chores_log_performance1 index 2022-02-11 17:46:17 +01:00
Bernd Bestel
69a7ea6057 Added a new "adaptive" chore period type (closes #1495) 2022-02-10 18:06:33 +01:00
Bernd Bestel
f88bad4bde Remove period_days for old dynamic-regular chores on migration 2022-02-09 20:28:03 +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
0d1f2ad09d Squashed commit 
Optimized new chore start date handling (references #1612)
Change yearly chore schedule to be on the same day each year (closes #817)
Use the last price for out of stock ingredients (closes #779)
Make it optionally possible to show the recipes list full-width (closes #1772)
 2022-02-09 17:48:21 +01:00
Bernd Bestel
61a1b1428a Added a chore start date option (closes #1612) 2022-02-08 20:35:47 +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
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
28f7700dac Fixed recipe ingredient stock fulfillment shopping list amount comparison (fixes #1717) 2022-02-06 20:02:19 +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
c1952e98bc Show stock journal entries of deleted users / fixed default user handling (fixes #1725) 2022-01-06 15:14:32 +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