kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity
2,128 Commits 2 Branches 80 Tags
efc7b999bb1ded27448a1c4ce64327c9d9bc53dc
Commit Graph

353 Commits

Author SHA1 Message Date
Bernd Bestel
4e56dee6f0 Finalized "Auto reprint stock entry label" (closes #2092) 2023-01-05 20:12:15 +01:00
Bernd Bestel
0585e80c70 Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +01:00
Bernd Bestel
39d1f49431 Fixed demo data generation 2022-12-26 10:12:29 +01:00
Bernd Bestel
46c4cdb81a Return numbers as numbers on all API endpoints 2022-12-25 20:49:11 +01:00
Bernd Bestel
639ef0da5b Fixed PHP 8.1 deprecation notice 2022-12-25 20:35:25 +01:00
Bernd Bestel
0229d187ae Removed qu_factor_purchase_to_stock (migrated existing factors to normal product specific QU conversions) 2022-12-25 19:48:22 +01:00
Bernd Bestel
dd409b4bf9 Fixed consume amount calculation when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved (fixes #2076) 2022-12-21 21:00:49 +01:00
Bernd Bestel
38a4ad8ec4 Upgraded to PHP 8.1 2022-12-10 15:19:11 +01:00
Bernd Bestel
018449c648 Added more demo QU conversions 2022-12-04 20:39:16 +01:00
Bernd Bestel
8175b1bcfe Simplified product specific QU display/edit and added more demo QU conversions 2022-12-04 20:25:33 +01:00
Bernd Bestel
7d4a9602ab Return the battery object in endpoint /batteries (closes #2045) 2022-11-19 19:33:50 +01:00
Bernd Bestel
68aad90a59 Optimize SQLite database file after migrations have run 2022-08-28 20:45:22 +02:00
Bernd Bestel
24c9247663 Make it possible to edit a user without necessarily updating the users password (closes #1942) 2022-08-27 14:54:52 +02:00
Bernd Bestel
7e2f30396f Fixed consume recipe product_id handling /w parent/child products (closes #1982) 2022-08-27 14:25:55 +02:00
Bernd Bestel
f1bc2cc40f Fixed that consuming partially fulfilled recipes was possible (fixes #1981) 2022-08-27 00:08:23 +02:00
Bernd Bestel
c0d0b8fc90 Fixed default consume rule ORDER BY handling related to stock_next_use (fixes #1979) 2022-08-26 11:15:15 +02:00
Akosh Pinter
312dd8a200 Fixes for losing Stock Note field content #1961 (#1962) 
* Fixed losing Note field content #1961

Fixed losing Note field content when splitting stock entries #1961

* Applied code formatting rules

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2022-08-06 17:35:11 +02:00
Bernd Bestel
57d70851c8 Fixed stock overview page status button counters related to the product option "Never show on stock overview" (fixes #1956) 2022-07-24 21:36:29 +02:00
Bernd Bestel
0b532f7624 Fixed StockService->ConsumeProduct $productStockAmount check (fixes #1949) 2022-07-18 17:35:35 +02:00
Bernd Bestel
dfdf45fa56 Fixed meal plan product/note calendar items links (fixes #1897) 2022-05-23 22:28:45 +02:00
Bernd Bestel
af7de61c43 Typo 2022-05-14 17:11:40 +02:00
Bernd Bestel
5406448be0 Use singular localization form when plural form is not provided (closes #1878) 2022-05-14 17:10:48 +02:00
Bernd Bestel
a5e3442602 Don't enforce first/last name when creating users (closes #1888) 2022-05-14 16:59:11 +02:00
Bernd Bestel
8ab511361a Do "auto add missing products to shopping list" also on product open actions (fixes #1873) 2022-04-27 22:50:20 +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
632db0d8d1 Fixed new user settings naming 2022-04-07 19:25:27 +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
e336f24225 Upgraded Font Awesome to v6 2022-04-04 20:27:51 +02:00
Bernd Bestel
61ed756dd0 Implemented "default consume location" handling (closes #1365) 2022-04-03 21:15:05 +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
a5294262e6 Added a user setting to automatically add missing products to the shopping list (closes #1266) 2022-04-03 13:00:14 +02:00
Bernd Bestel
f7c33a4579 Optionally show out of stock products on the location content sheet (closes #1641) 2022-04-01 21:55:06 +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
91b984d52d Make user settings available in SQLite (needed for #1813) 2022-03-29 19:44:01 +02:00
Bernd Bestel
acebed5aae Clear manually rescheduled date on chore execution (references #1830) 2022-03-27 16:11:16 +02:00
Bernd Bestel
f41a219760 Optimized chores and tasks demo data 2022-03-27 14:48:19 +02:00
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