Commit Graph

355 Commits

Author SHA1 Message Date
Bernd Bestel
9cdb0908d6
Make it possible to hide locations/stores/QUs/product_groups/task_categories (closes #2222) 2023-05-13 14:24:52 +02:00
Bernd Bestel
71d44edb8c
Optimized week recipe handling in mealplan (fixes #2168) 2023-04-01 22:04:30 +02:00
Travis Raup
340832c361
Feature: Stock Purchase Metrics (#2135)
* Feature: Stock Purchase Metrics

* chart update

* Refactor to chartjs

* More suggestion edits

- locale in javascript
- global translations
- commit migrations sql file

* Rename 0215.sql to 0216.sql

Fixed merge conflict

* Fixed merge conflict

* Applied code style

* Added missing demo data translations

* Removed unused package "canvasjs"

* Don't include daterangepicker globally when only needed on a single page / fixed view section imports

* Rename this to "Spendings" / name it more generically "Stock reports"

* Reuse the existing product_price_history view

* Final cleanup

* Whitespace fix

---------

Co-authored-by: Travis Raup <travis.raup@platform.sh>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2023-04-01 17:05:41 +02:00
Bernd Bestel
3d01854fa1
Don't use double quotes for SQL string literals (references #2170) 2023-03-16 21:16:27 +01:00
Bernd Bestel
7336693ca2
Optimized stock_missing_products view (fixes #2154) 2023-03-02 19:36:57 +01:00
Bernd Bestel
d8d3c3ef0b
Split the quick consume and open amount product option (closes #2127) 2023-02-05 20:37:39 +01:00
Bernd Bestel
efc7b999bb
Fixed product average price/last price/price history chart handling regarding empty/0 prices (fixes #2106) 2023-01-13 13:19:22 +01:00
Bernd Bestel
4e56dee6f0
Finalized "Auto reprint stock entry label" (closes #2092) 2023-01-05 20:12:15 +01:00
Bernd Bestel
76500c57bd
Optimize recipe ingredient costs/calories calculation when only_check_single_unit_in_stock is used (closes #780) 2022-12-26 19:48:26 +01:00
Bernd Bestel
0585e80c70
Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +01:00
Bernd Bestel
2d62f8ddeb
Automatically create a default (product specific 1 to 1) QU conversion when a product with qu_stock != qu_purchase was created and when no default QU conversion applies 2022-12-26 09:28:18 +01:00
Bernd Bestel
b76abf54ab
Simplified qu_factor_purchase_to_stock handling 2022-12-26 09:20:41 +01:00
Daniel Albert
79590cd5ac
Add migration for improved quantity_unit_conversions_resolved view (#2082) 2022-12-26 09:06:17 +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
407344e86a
Fixed recipe ingredient costs/calories calculation when product substitution and unit conversions is involved at the same time (fixes #2075) 2022-12-21 20:16:22 +01:00
Bernd Bestel
2ebb9b2cd9
Show product group Userfields on the shopping list (closes #2069) 2022-12-18 20:56:02 +01:00
Bernd Bestel
50fac692ad
Added a dialog to show product related resolved QU conversions (references #2056 and #1360) 2022-12-04 19:02:15 +01:00
Daniel Albert
d889e9d3ad
Fix quantity_unit_conversions_resolved view (#2057)
This change makes the view work for products to which only default
conversions apply.
Before, they would not have appeared in the results.
2022-12-04 18:39:33 +01:00
Bernd Bestel
daa0a59c5f
Support transitive QU conversions on the frontend (references #2056, closes #1360) 2022-12-04 13:12:01 +01:00
Bernd Bestel
46313e2c75
Applied code formatting rules for #2056 2022-12-04 12:33:12 +01:00
Daniel Albert
541c0be6be
Add support for transitive unit conversions (#2056)
* Add support for transitive unit conversions

* Rewrite quantity_unit_conversions_resolved view
2022-12-04 12:18:18 +01:00
Bernd Bestel
e8f76e5694
Prevent adding recipe ingredients with a unit for which no conversion exists (closes #2013)
Wasn't a problem of the web frontend, only possible by externally/manually using the API and not thinking about that that's bullshit.
2022-09-30 12:32:39 +02:00
Bernd Bestel
af4715e17f
Fixed product average price rounding 2022-08-29 20:56:15 +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
Bernd Bestel
c396c2a84c
Also update from_qu_id and to_qu_id of inverse unit conversions automatically (closes #1977) 2022-08-24 21:10:22 +02:00
Bernd Bestel
52e2c6d480
Fixed qu_id_stock change handling related to product_barcode amounts (fixes #1976) 2022-08-22 23:58:34 +02:00
Bernd Bestel
2fbd559105
Fixed qu_id_stock change handling related to the products own amount properties (fixes #1975) 2022-08-22 23:46:47 +02:00
Bernd Bestel
58c6b72d77
Fixed qu_id_stock change handling when needed conversion is only defined by the products qu_factor_purchase_to_stock (fixes #1973) 2022-08-22 20:11:57 +02:00
Bernd Bestel
dfe9868a48
Fixed qu_id_stock change handling when needed conversion is only defined globally (fixes #1974) 2022-08-22 19:53:58 +02:00
Bernd Bestel
06968ac289
Fixed stock entry Userfield edit handling (fixes #1969) 2022-08-18 21:29:19 +02:00
Bernd Bestel
a80e048c2d
Optimized product_barcodes handling (references #1928) 2022-06-30 13:38:30 +02:00
Bernd Bestel
bef261d869
Fixed average shelf life (productcard) for edited stock entries (fixes #1924) 2022-06-27 20:26:32 +02:00
Bernd Bestel
27582611c1
Split user setting stock_decimal_places_prices into separate settings for input/display (closes #1893) 2022-06-04 14:09:35 +02:00
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
Bernd Bestel
fc413a05d1
Simplified stock entry label printing options (on purchase) (references #1647) 2021-11-13 18:26:01 +01:00
Bernd Bestel
f2bef554a4
Fixed track date only chores next_estimated_tracking time comparision (fixes #1655) 2021-11-12 18:02:46 +01:00
Bernd Bestel
beae32ef23
Added the products average price as a hidden by default column on the stock overview page (closes #1677) 2021-11-09 19:39:32 +01:00
Bernd Bestel
35469c3d98
Fixed QU resolve priority (fixes #1616) 2021-09-27 18:09:30 +02:00
Bernd Bestel
cebb368a28
Enforce min_stock_amount for child products where the parent has cumulate_min_stock_amount_of_sub_products enabled (fixes #1595) 2021-09-27 17:39:00 +02:00
Bernd Bestel
cebf7a3e54
Don't consider inactive products to be missing (fixes #1578) 2021-08-17 18:00:33 +02:00
Bernd Bestel
53e405c4f8
Fixed migration when having unsupported parent/child product nesting levels (fixes #1542) 2021-07-25 20:22:10 +02:00
Bernd Bestel
f47ca963ab
Fixed duplicate barcode migration error (fixes #1546) 2021-07-23 16:37:45 +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
1bacd8e13d
Typo / added missing changelog 2021-07-14 18:15:02 +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
e1c702f3d0
Typo 2021-07-12 20:45:30 +02:00
Bernd Bestel
71cede74a3
Make it possible to copy meal plan days (closes #573) 2021-07-12 20:44:42 +02:00
Bernd Bestel
8cb8611b4f
Added a new product option "Should not be frozen" (closes #1320) 2021-07-12 19:27:21 +02:00
Bernd Bestel
4aee175105
Keep the newest instead of the oldest on campacting stock entries 2021-07-12 18:58:49 +02:00