Bernd Bestel
90a0caf1dc
Fixed meal plan recipe servings stock fulfillment checking ( fixes #1391 )
2021-07-10 12:32:29 +02:00
Bernd Bestel
8ff8c1ac5d
Made the used grocycode barcode type configurable
...
DataMatrix reading via Quagga2 doesn't work currently, so default to an supported 1D barcode (=> Code128)
2021-07-09 23:08:47 +02:00
Bernd Bestel
2638bce851
Improve handling of not in-stock but valid manually entered products on the consume and transfer page (references #1429 )
2021-07-09 22:16:08 +02:00
Bernd Bestel
8348438148
Workaround for file upload problem when the file name contains Umlaute (seems to be a Linux only issue, fixes #1382 )
2021-07-09 21:23:04 +02:00
Bernd Bestel
8c5c12cb47
Added new columns on the stock overview page ( closes #1351 )
2021-07-08 20:42:07 +02:00
Bernd Bestel
8b977644f7
Added the product descrption as a column on the stock overview page ( closes #1362 )
2021-07-08 20:22:51 +02:00
Bernd Bestel
1ead23cb87
Added on option to only show in-stock products on the /products page ( closes #1388 )
2021-07-06 20:08:02 +02:00
Bernd Bestel
6530d0f9df
Clarify that "Group by product group" (printing a shopping list) works only for the list layout type ( closes #1405 )
2021-07-06 19:48:55 +02:00
Bernd Bestel
135ac118b0
Added a filter for only done items on the /shoppinglist page ( closes #1406 )
2021-07-06 19:40:26 +02:00
Bernd Bestel
54bf7ed659
Produce a schema-valid OpenAPI specification ( closes #1457 )
2021-07-05 23:23:59 +02:00
Bernd Bestel
0dc37fb361
Don't allow a min. stock amount for child products when the parent has "Accumulate sub products min. stock amount" set (references #1409 )
2021-07-04 17:36:44 +02:00
Bernd Bestel
734e174442
Fixed the "Add as barcode to existing product" productpicker workflow from the /shoppinglistitem page ( fixes #1262 )
2021-07-04 15:46:19 +02:00
Bernd Bestel
fbb0064505
Consider selected QU for calories calculation for "Only check if any amount is in stock" recipe ingredients ( fixes #1338 )
2021-07-03 20:01:49 +02:00
Bernd Bestel
4b02ac8f35
Fixed shopping list setting initialization ( fixes #1344 )
2021-07-03 19:43:32 +02:00
Bernd Bestel
cc9345136c
Use exact search for product filter on /stockjournal and /stockjournalsummary ( fixes #1353 )
2021-07-02 18:24:08 +02:00
Bernd Bestel
5ba9bbbcd1
Fixed mssing-recipe-ingredients-to-shopping-list checkbox inner-click ( fixes #1383 )
2021-07-02 18:04:20 +02:00
Bernd Bestel
cae924eb81
Fixed shopping list QU handling ( fixes #1385 , fixes #1384 )
2021-07-02 17:37:06 +02:00
Bernd Bestel
9f833b9bd5
Prvent potentially duplicate stock items in drodpown on /consume and /transfer page ( fixes #1368 )
2021-07-02 16:59:37 +02:00
André Heuer
416c138017
Added support for Code 39 ( #1527 )
2021-06-29 17:40:28 +02:00
Bernd Bestel
7587ead732
Fixed /tasks group by category ( fixes #1274 )
2021-06-28 19:31:27 +02:00
Bernd Bestel
35fb87ab1e
Squashed commit
...
Use managed fonts
Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218 )
Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302 )
Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396 )
Allow arrays in HTMLPurifier (fixes #1407 )
2021-06-28 17:00:16 +02:00
Bernd Bestel
5153818b4e
Fixed shopping_list_id when adding products from /stockoverview to the shopping list ( fixes #1442 )
2021-06-27 20:46:21 +02:00
Bernd Bestel
7133c85deb
Persist filters on reload (recipe selection change) on the /recipes page ( fixes #1455 )
2021-06-27 20:28:12 +02:00
Bernd Bestel
b7a6b91039
Fixed stock QU change restriction / include undone stock transactions ( fixes #1473 )
2021-06-27 19:11:45 +02:00
Bernd Bestel
e646dd9332
Fixed barcode QU was not saved for single QU products ( fixes #1504 )
2021-06-27 19:04:09 +02:00
Bernd Bestel
30e5cc3bc3
Fixed filter clearing on /quantityunits ( fixes #1511 )
2021-06-27 18:42:15 +02:00
Bernd Bestel
e44f4802d5
Fixed filter clearing on /products ( fixes #1512 )
2021-06-27 18:41:07 +02:00
Bernd Bestel
9ef48e79cd
Remove user request parameter when clearing filter on /choresoverview ( fixes #1513 )
2021-06-27 18:39:29 +02:00
Bernd Bestel
3acad5056a
Fixed inventory action hint when entered amount equals current stock amount ( fixes #1522 )
2021-06-27 18:37:18 +02:00
Bernd Bestel
9a0cad079c
Fixed undoing consume/open from notification on /stockentries ( fixes #1524 )
2021-06-27 18:32:22 +02:00
Bernd Bestel
f8fa5db3e7
Fixed multiple datetimepicker contextual timeago (references #1520 )
2021-06-24 07:46:32 +02:00
Bernd Bestel
5e189c8a4a
Fixed multi instace date/time Userfields ( fixes #1520 )
2021-06-23 22:13:54 +02:00
Marc Ole Bulling
eb135aee39
Add support for printing shoppinglist with thermal printer ( #1273 )
...
* Added escpos-php library
* Added button to shoppinglist print menu
* Added to translation
* Added basic printing logic and API call
* Working implementation for printing with the API
* Added openapi json
* Correctly parsing boolean parameter
* Working button in UI
* Change to grocy formatting
* Add Date
* Only show thermal print button when Feature Flag is set
* Fixed API call and added error message parsing
* Undo translation
* Add flag to print quantities as well
* Added printing notes
* Added quantity conversion
* Increse feed
* Fixed that checkbox was undefined, as dialog was already closed
* Added padding
* Formatting
* Added note about user permission
* Fixed error when using notes instead of products
* Review
- Default FEATURE_FLAG_THERMAL_PRINTER to disabled
- Added missing localization strings (and slightly adjusted one)
* Fixed merge conflicts
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-18 20:45:42 +02:00
Katharina Bogad
2471e78188
Grocycode, label printing ( #1500 )
...
* Grocycode: Productpicker, StockService
* Grocycode: Datamatrix generation
* Grocycode: Display in UI, make Images downloadable
* Grocycode: Do not show on product card
* Grocycode: Stockentry Label view
* Grocycode: Webhooks & Labelprinter Feature
* Grocycode: Manual Label printing
* Grocycode: Print Label from product form
* Quagga2: use zxing for DataMatrix recognition
* Grocycode: Default settings for label printing
* Prepare merge of master
* Grocycode: docs
* Docs: label printing webhook
* Review
- "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode"
- Unified phrases / capitalization
- Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page)
- Documented API changes for Swagger UI (grocy.openapi.json)
- Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there)
- Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`)
- Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3 )
- Default `FEATURE_FLAG_LABELPRINTER` to disabled
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-12 17:21:12 +02:00
Bernd Bestel
d23fda245e
Fixed that the number picker up/down buttons did not work when the input field was empty or contained an invalid number
2021-03-31 22:26:27 +02:00
Bernd Bestel
791a17fcad
Default shopping list item amount to 1
2021-03-31 22:22:28 +02:00
Edward Betts
7bbcec91aa
Correct spelling ( #1420 )
2021-03-31 22:12:51 +02:00
Bernd Bestel
906a9db628
Fixed embedded /transfer from /stockentries ( fixes #1303 )
2021-02-21 19:36:37 +01:00
Lauri Niskanen
33dcd17fbd
Fix rounding error on total value calculation ( #1347 )
...
* Fix rounding error on total value calculation
* Remove unused 'amountSum' calculation
2021-02-21 18:10:41 +01:00
Bernd Bestel
a455a01204
Fixed print layout display handling ( fixes #1272 )
2021-01-30 13:11:40 +01:00
Bernd Bestel
a1adc80c29
Fixed consuming Scan Mode timing ( fixes #1292 )
2021-01-30 13:06:44 +01:00
Marc Ole Bulling
c889416c0a
Fix for #1289 and #1261 ( #1297 )
2021-01-30 12:47:12 +01:00
Marc Ole Bulling
20380faeb3
Fix for #1271 ( #1286 )
2021-01-30 12:39:10 +01:00
Bernd Bestel
45abc99a77
Use barcode amounts also for Consume/Transfer/Inventory ( closes #1254 )
2021-01-04 21:59:19 +01:00
Bernd Bestel
d78e156609
Use barcode defaults also for scan mode ( fixes #1253 )
2021-01-04 21:15:22 +01:00
Bernd Bestel
fdeb4fd4d7
Validate product form once presets are prefilled ( fixes #1250 )
2021-01-03 16:22:35 +01:00
Bernd Bestel
97fdb0553c
Fixed shopping list to stock worfklow skip button ( fixes #1248 )
2021-01-02 20:54:31 +01:00
Bernd Bestel
fe665ac766
Fixed potential problem mentioned in https://github.com/grocy/grocy/issues/882#issuecomment-753357049
2021-01-01 20:00:24 +01:00
Bernd Bestel
c65f375a68
Only change the current number input by arrow keys ( fixes #1232 )
2020-12-31 13:48:36 +01:00
Bernd Bestel
1459f8c441
Prevent form submit when any combobox-dropdown is open ( fixes #1236 )
2020-12-31 13:45:14 +01:00
Bernd Bestel
1e27f6c127
Fixed product opening success message ( fixes #1237 )
2020-12-31 13:11:51 +01:00
Bernd Bestel
5cd3fb092a
Improved initial DataTables sorting ( fixes #1235 )
2020-12-30 13:55:01 +01:00
Bernd Bestel
200964edff
Use numberpicker up/down buttons for up/down keys ( fixes #1232 )
2020-12-30 08:29:11 +01:00
Bernd Bestel
17a4d04053
Fixed store picker validation ( fixes #1233 )
2020-12-30 08:22:43 +01:00
Bernd Bestel
d79adc4660
Optimized embedded productpicker workflows (references #1226 )
2020-12-29 21:18:51 +01:00
Bernd Bestel
9f1692e31f
Improved shopping list item form validation ( closes #1226 )
2020-12-29 21:06:31 +01:00
Bernd Bestel
87754830f7
Fix initial consume form validation ( fixes #1230 )
2020-12-29 18:11:45 +01:00
Bernd Bestel
6263715c53
Fixed shopping list item form load handling ( fixes #1222 )
2020-12-28 19:59:18 +01:00
Bernd Bestel
590cbd2460
Support indirect QU conversions ( fixes #1217 )
2020-12-24 15:07:04 +01:00
Bernd Bestel
2e3c237648
Fixed zero decimals handling ( fixes #1213 )
2020-12-23 19:56:37 +01:00
Bernd Bestel
2f8207ab5f
Fixed (again) purchase success message when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (references #1214 )
2020-12-23 15:58:05 +01:00
Bernd Bestel
904848d09a
Fixed purchase success message when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled ( fixes #1214 )
2020-12-23 14:37:02 +01:00
Bernd Bestel
937bd6b702
Fixed camera scanning targets ( fixes #1210 )
2020-12-22 19:06:41 +01:00
Bernd Bestel
5c8ed05f68
Use dynamic barcode types (references #1133 )
2020-12-22 10:20:31 +01:00
Bernd Bestel
00c8934046
Use better confirm dialog
2020-12-22 10:05:06 +01:00
Bernd Bestel
ab29233f07
Added a head line on the shopping list print options dialog
2020-12-21 21:42:21 +01:00
Bernd Bestel
694b78f72a
Optimized GROCY_FEATURE_FLAG_STOCK handling ( closes #966 )
2020-12-21 20:13:49 +01:00
Bernd Bestel
cf299a3d0b
Optimized file save/delete handling
2020-12-21 19:16:14 +01:00
Bernd Bestel
d83271655c
Fixed purchase success message amount
2020-12-21 18:27:12 +01:00
Bernd Bestel
431a2ab9f7
Added new Userfield type "Link (with title)" ( closes #790 )
2020-12-21 17:57:48 +01:00
Bernd Bestel
e97fccd03a
Optimized shopping list header
2020-12-21 16:29:39 +01:00
Bernd Bestel
e62994eb4a
Fixed not required field initialization when GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (references #1202 )
2020-12-21 10:52:40 +01:00
Bernd Bestel
2b13102299
Implemented Userfields for users ( closes #1159 )
2020-12-20 22:16:58 +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
dadf93a94c
Merge used libraries for Barcode/QR-Code generation
2020-12-20 19:53:28 +01:00
Bernd Bestel
1d16021404
Show barcode as barcode-image on shopping list ( closes #1133 )
2020-12-20 19:31:12 +01:00
Bernd Bestel
3fb55b706b
Refresh chore-/batterycard after tracking
2020-12-20 15:04:46 +01:00
Bernd Bestel
580598b817
Fixed max consume amount was not set
2020-12-20 15:01:59 +01:00
Bernd Bestel
a5326aa95c
Improve API stock action endpoint response ( closes #769 )
2020-12-20 14:43:07 +01:00
Bernd Bestel
76e4a1578c
Added Default store as a column to the shopping list ( closes #957 )
2020-12-20 10:26:02 +01:00
Bernd Bestel
268b8e87d7
Make it possible to hide chores/batteries ( closes #1069 )
2020-12-20 10:19:44 +01:00
Bernd Bestel
832141a718
Made the shopping list print view configurable ( closes #740 )
2020-12-19 23:57:33 +01:00
Bernd Bestel
f5e0709913
Added columns for last price on shopping list ( closes #410 )
2020-12-19 17:55:49 +01:00
Bernd Bestel
7f24ffc484
Clarify string
2020-12-19 17:38:04 +01:00
Bernd Bestel
362b3f8508
Added min. stock amount column to stock overview ( closes #856 )
2020-12-19 17:25:13 +01:00
Bernd Bestel
3ad5f2cac5
Added a note field to product barcodes ( closes #962 )
2020-12-19 17:20:54 +01:00
Bernd Bestel
574d17fa52
General UI review/test
2020-12-19 14:03:28 +01:00
Bernd Bestel
7ef5bc6f77
Add some more columns (hidden by default) (references https://github.com/grocy/grocy/issues/1058#issuecomment-744059155 )
2020-12-19 10:51:07 +01:00
Bernd Bestel
cc2ea93313
Make DataTable row groups collapsible everywhere (references #1189 )
2020-12-17 17:41:31 +01:00
Bernd Bestel
b5fc64cf5d
Fixed DataTables numeric/datetime sorting ( fixes #1085 )
2020-12-17 17:33:24 +01:00
Bernd Bestel
9572652a8a
Fixed total price for tare weight handling enabled products ( fixes #1196 )
2020-12-17 16:50:15 +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
d9a3c5169e
Fixed product copy source / default value prefilling handling ( fixes #1179 )
2020-12-16 17:51:05 +01:00
PhyberApex
596a7ccd36
Removing of resize event ( #1190 )
...
* Removing of resize event
Hey,
I removed that resize event as it get's thrown every time you scroll on a mobile device. Which prevented me from actually viewing the list view of the calender on mobile devices.
Let me know if you think it is still needed tho!
~Cheers
* Update calendar.js
Now it only get's called once :)
* Update mealplan.js
Same thing here as in calendar.js
* Update calendar.js
Removed redundant variable
2020-12-16 17:26:39 +01:00
Bernd Bestel
19802bc122
Fixed localization string
2020-12-07 19:55:31 +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
2bdb6ab2d4
Use the products "Quick consume amount" optionally also on the consume page ( closes #1148 )
2020-12-04 18:16:58 +01:00
Bernd Bestel
bbdc372dcf
Use total price for product_barcodes.last_price (references #1131 )
2020-11-17 22:06:52 +01:00
Bernd Bestel
2b4d8a7cc5
Load userobject forms in dialogs
2020-11-17 21:18:05 +01:00
