257 Commits

Author	SHA1	Message	Date
Katharina Bogad	18ad5a8f12	Merge remote-tracking branch 'origin' into grocycode	2021-06-11 18:54:19 +02:00
Katharina Bogad	01a9d43ebb	Grocycode: Default settings for label printing	2021-06-11 18:52:16 +02:00
Katharina Bogad	6951c1dfac	Grocycode: Manual Label printing	2021-06-08 18:07:54 +02:00
Katharina Bogad	074f045f40	Grocycode: Webhooks & Labelprinter Feature	2021-06-08 16:26:12 +02:00
Katharina Bogad	8a36b09485	Grocycode: Productpicker, StockService	2021-06-06 22:30:22 +02:00
Edward Betts	7bbcec91aa	Correct spelling (#1420)	2021-03-31 22:12:51 +02:00
Bernd Bestel	f5eff8ab49	Include due_type = "Expiration date" products in /stock/volatile API endpoint (fixes #1372)	2021-02-21 18:18:34 +01:00
Bernd Bestel	bfa3347a20	Fixed that editing stock entries was not possible (fixes #1268)	2021-01-12 18:04:20 +01:00
Bernd Bestel	8c0ff04caa	Fixed consume stock amount check for product substitution (fixes #1240)	2021-01-01 13:27:57 +01:00
Marc Ole Bulling	7e8f460dad	Added /system/time API call (#1223) ... * Inital structure for /system/time API call * Parse arguments for offset * Correctly parsing parameters * Fixed implimentation, added to openapi.json * Modified DOC * Added Sqlite3 time to output * Fixed error with negative offset * Review Co-authored-by: Bernd Bestel <bernd@berrnd.de>	2020-12-28 19:39:24 +01:00
Bernd Bestel	2e3c237648	Fixed zero decimals handling (fixes #1213)	2020-12-23 19:56:37 +01:00
Bernd Bestel	a333ccbb78	Optimizes demo data	2020-12-22 10:12:37 +01:00
Bernd Bestel	431a2ab9f7	Added new Userfield type "Link (with title)" (closes #790)	2020-12-21 17:57:48 +01:00
Bernd Bestel	8f1ce607f7	Implemented user pictures (closes #1158)	2020-12-20 22:08:50 +01:00
Bernd Bestel	c9b5e14473	Make it possible to merge products (closes #243)	2020-12-20 20:58:22 +01:00
Bernd Bestel	df7653f4e5	Optimized barcode concatenation handling	2020-12-20 16:00:14 +01:00
Bernd Bestel	a5326aa95c	Improve API stock action endpoint response (closes #769)	2020-12-20 14:43:07 +01:00
Bernd Bestel	268b8e87d7	Make it possible to hide chores/batteries (closes #1069)	2020-12-20 10:19:44 +01:00
Bernd Bestel	250b308d5d	Support -1 for "Default due days after freezing" (closes #846)	2020-12-19 17:32:47 +01:00
Bernd Bestel	5421dfb6b2	Make the chore assignment type "Random" more random (closes #674)	2020-12-19 17:15:18 +01:00
Bernd Bestel	eb4a748da3	Consume opened products first (closes #1183)	2020-12-19 10:28:35 +01:00
Robert Resch	07ff28da39	Add row group customization (#1189) ... * Add row group customization * fix rowGroup state loading * activate rowGroup for all datatables * add reset button * reload page done on success callback * Review Co-authored-by: Bernd Bestel <bernd@berrnd.de>	2020-12-16 18:18:03 +01:00
Bernd Bestel	25f5f98b75	Fixed undoing a consume transaction of an opened item added it back to stock unopened (fixes #1191)	2020-12-16 17:44:51 +01:00
Bernd Bestel	59aad1c180	Added REGEXP operator for API query filter (closes #1174)	2020-12-12 10:44:27 +01:00
Bernd Bestel	d3883ba93a	Reorganized API exposed entities	2020-12-12 10:10:21 +01:00
Bernd Bestel	4b1766ead0	Return default user setting if not configured for API endpoint /user/settings/{settingKey} (fixes #1169)	2020-12-10 18:02:24 +01:00
Bernd Bestel	cf34df5e3f	Squashed commit ... Fixed some localization strings Reviewed/optimized product deletion handling Add option to hide products from the stock overview page (closes #906) Prefill default_due_days also on the inventory page (closes #591) Added DataTables accent chinese-string plugin (closes #872) Show costs and calories per recipe ingredient (closes #1072) Fixed user permission saving (fixes #1099) User permissions should not have an effect for demo mode (closes #972) Handle QU conversion when consuming a substituation (child) product (fixes #1118) Consume/open any child product when the parent product is not in stock (closes #899) Added a retry camera barcode scanning button to product picker workflow (closes #736)	2020-12-07 19:48:33 +01:00
Bernd Bestel	166748788b	Added an include_sub_products parameter to the API endpoint /stock/products/{productId}/locations	2020-11-19 18:37:16 +01:00
Bernd Bestel	211239a5d3	Fixed /stock/products/{productId}/entries endpoint query parameter include_sub_products did not work (however)	2020-11-19 18:28:16 +01:00
Bernd Bestel	631831e1e4	Use custom demo DB path suffix also for storage (references #395)	2020-11-19 12:24:26 +01:00
Bernd Bestel	f9d566c55c	Support custom DB path suffixes for demo mode (closes #395)	2020-11-18 19:42:05 +01:00
Bernd Bestel	5634abed82	Use transactions for database migrations	2020-11-17 20:22:38 +01:00
Bernd Bestel	6270f39688	Make Userfields reorderable (closes #1134)	2020-11-17 20:12:45 +01:00
Bernd Bestel	887526c727	Squashed commit ... Fixed number input min/max amount handling Only (auto) save valid user inputs More filters on the stock journal pages Save the last price per used barcode and preselect that as a total price on purchase if not empty (closes #1131) Don't apply conversions for only_check_single_unit_in_stock ingredients (fixes #1120) Render shopping list userfields (closes #1052) Fixed Focus when adding included recipes (closes #1019) Order all base objects with NOCASE (closes #1086)	2020-11-17 19:11:02 +01:00
Bernd Bestel	7b4edf3147	Adapt shopping list add expired products for #851	2020-11-15 22:38:21 +01:00
Bernd Bestel	b393998601	Distinguish expiry/best before dates (closes #851)	2020-11-15 19:53:44 +01:00
Bernd Bestel	28276191cc	Don't allow tare weight handling enabled products to be opened (closes #770)	2020-11-14 22:51:06 +01:00
Bernd Bestel	b0b3322266	Also relate the shopping list amount to QU stock	2020-11-13 17:30:57 +01:00
Bernd Bestel	ab68a51ba7	Recipe edit page fixes	2020-11-13 15:46:44 +01:00
Bernd Bestel	68eeb07e5f	Test/review/rework (and hopefully finalized) new price handling	2020-11-10 18:11:33 +01:00
Bernd Bestel	0134535a5e	Fix/workaround for undfined constant GROCY_LOCALE	2020-11-08 21:37:43 +01:00
Bernd Bestel	d82fd09fba	UI test/review	2020-11-08 15:09:10 +01:00
kriddles	cb3978cdbd	AddProduct Fix (#1110)	2020-10-31 16:24:49 +01:00
kriddles	9bbcdafab9	Add purchased date to inventory (#1102) ... * Add purchased date to inventory * Clarify stock settings label Co-authored-by: Bernd Bestel <bernd@berrnd.de>	2020-10-29 17:04:34 +01:00
kriddles	fb17c57dd3	inventory fix for quFactorPurchaseToStock - defaults to product details (#1081)	2020-10-26 10:10:10 +01:00
kriddles	46e8123477	Allow price up to 4 decimals instead of 2 (#1077) ... * Allow price to be 4 decimals * remove logging * Finalize custom decimal places by user setting * Typo Co-authored-by: Bernd Bestel <bernd@berrnd.de>	2020-10-20 20:08:54 +02:00
Bernd Bestel	94214b867a	More authentication refactoring to also provide "plugable" credentials handling (references #921, needed for #305)	2020-10-19 18:38:12 +02:00
Bernd Bestel	ccd2caa44c	Fixed GetProductIdFromBarcode returned wrong id & use default qu_factor_purchase_to_stock when not provided when adding products to stock (fixes #1068)	2020-10-18 14:09:54 +02:00
fipwmaqzufheoxq92ebc	a85998dd40	Improvements (#1049) ... * Fixes #1035: Check available amount after filtering by stock_entry_id * Fixes #1036: Remove stock-related buttons/options from Shopping-list if FEATURE_FLAG_STOCK is disabled * Fixes #1010: Repair recipe-picture upload. * Fixes #958: Disable auto-reload of equipments-page. * Fix uncaught exception in locationpicker.js * Fixes #761 and #762: Add "Remove exact amount" for products with tare weight handling and use it for recipe-consumption. * Fixes #1048: Repair product-group-filter on "Master Data"/Products * Renamed variable Co-authored-by: Bernd Bestel <bernd@berrnd.de>	2020-10-14 17:48:37 +02:00
Bernd Bestel	a66a4d0c22	Fix missing property warnings (references #1025)	2020-10-12 17:50:33 +02:00