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
Kendell R
55ac768521
Night mode improvements ( #1331 )
...
* Night mode readability improvements
* Update grocy_night_mode.css
* Update grocy_night_mode.css
2021-02-14 12:49:44 +01:00
Bernd Bestel
a455a01204
Fixed print layout display handling ( fixes #1272 )
2021-01-30 13:11:40 +01:00
Bernd Bestel
8b963ae0f1
Merge branch 'master' of https://github.com/grocy/grocy
2021-01-30 13:07:16 +01:00
Bernd Bestel
a1adc80c29
Fixed consuming Scan Mode timing ( fixes #1292 )
2021-01-30 13:06:44 +01:00
Marius Boro
760914bf82
Update grocy_night_mode.css ( #1269 )
...
Night mode updates for Grocy 3
2021-01-30 12:49:51 +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
f1ddd4a57e
Fixed JS error
2020-12-22 10:23:26 +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
360f25ec44
Make the new user picture a little bigger (references #1158 )
2020-12-21 09:49: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
ea888fffb7
Updated unmanaged dependencies
2020-12-19 14:28:32 +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
Bernd Bestel
639ffe13f5
Reverted 41067b23bb because that's not needed (references #1049 and #958 )
2020-11-17 21:10:26 +01:00
Bernd Bestel
7ef970a09f
Forgot to save...
2020-11-17 21:05:55 +01:00
Bernd Bestel
604629ed5e
Added a button to download equipment instruction manuals ( closes #833 )
2020-11-17 21:01:45 +01:00
Bernd Bestel
d2d09cf928
Removed dragscroll dependency ( fixes #1135 , references #1115 )
2020-11-17 20:50:04 +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
1316c1f25f
Don't colorize validated custom checkboxes/radios
2020-11-16 22:33:24 +01:00
Bernd Bestel
e85b21384f
Remove "Allow partial units in stock" product option / unify number input validation messages
2020-11-16 17:10:41 +01:00
Bernd Bestel
95fc6a6faa
Fixed RefreshLocaleNumberInput
2020-11-15 23:03:12 +01:00
Bernd Bestel
7b4edf3147
Adapt shopping list add expired products for #851
2020-11-15 22:38:21 +01:00
Bernd Bestel
1bbd7787d8
More proper number formatting
2020-11-15 22:29:47 +01:00
Bernd Bestel
b393998601
Distinguish expiry/best before dates ( closes #851 )
2020-11-15 19:53:44 +01:00
Bernd Bestel
9a7196b761
Make it possible to copy products ( closes #571 )
2020-11-15 16:05:25 +01:00
Bernd Bestel
7d7f9bf07a
Changed default label of dialog close button
2020-11-15 15:28:50 +01:00
Bernd Bestel
6eef19dfc6
Fixed DataTables state load when there are no settings saved
2020-11-15 15:20:50 +01:00
Bernd Bestel
22e9e4e311
Forgot to save...
2020-11-15 14:59:54 +01:00
Bernd Bestel
dd8fa5ff66
Save DataTable states server side
2020-11-15 14:58:35 +01:00
Bernd Bestel
6866109b97
Add clear filter button to stock entries page + mobile view optimizations (this now closes #1129 )
2020-11-15 14:48:48 +01:00
Bernd Bestel
7bf973dd32
Fix stock entries page dropdown menu overflow (references #1129 )
2020-11-15 14:30:00 +01:00
Bernd Bestel
4b342dbd43
Improved number input initial value decimal handling
2020-11-15 14:15:09 +01:00
Bernd Bestel
1d1642b464
Make the quick consume buttons on the stock overview page configurable per product ( closes #613 )
2020-11-15 09:57:45 +01:00
Bernd Bestel
185627af7d
Fixed table filters
2020-11-15 09:21:54 +01:00
Bernd Bestel
f85b89d4fa
Show a warning on purchase when purchased best before date is < in stock ( closes #948 )
2020-11-14 23:15:34 +01:00
Bernd Bestel
db5c9ce3e8
stockentryform amount doesn't need to handle tare weight
2020-11-14 22:54:29 +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
bb985c09ba
Fixed purchase/inventory embedded mode initial input focus handling
2020-11-14 11:53:35 +01:00
Bernd Bestel
1fbda392c2
Fixed product edit page returnto handling
2020-11-14 11:49:46 +01:00
Bernd Bestel
62997d39bc
Removde the /objects/{entity}/search API endpoint, added the new filter capabilities to /objects/{entity} (references #985 )
2020-11-14 11:27:13 +01:00
Bernd Bestel
b267295e86
Fixed product picker workflows
2020-11-14 11:05:36 +01:00
Bernd Bestel
42f70b04e7
Also show the price hint for single unit prices when purchase QU != stock QU
2020-11-13 17:43:28 +01:00
Bernd Bestel
b0b3322266
Also relate the shopping list amount to QU stock
2020-11-13 17:30:57 +01:00
Bernd Bestel
fa3a4ed688
Fixed productamountpicker initial converted amount was undefined
2020-11-12 22:47:00 +01:00
Bernd Bestel
c360cbec4c
UI strings/tooltips/basic handling review/optimizations
2020-11-12 21:35:10 +01:00
Bernd Bestel
c121c0483a
Fixed missing error message when trying to create a duplicate product
2020-11-12 13:09:46 +01:00
Bernd Bestel
0c8b6c55c1
Added total calories as a column to stock overview (references #1058 )
2020-11-11 22:38:01 +01:00
Bernd Bestel
0a600d3277
Fix hide/view columns dialog did not work on pages with more than 1 table (references #1058 )
2020-11-11 22:28:05 +01:00
Bernd Bestel
7c8a17ce78
Add calories as a column to stock overview (references #1058 )
2020-11-11 22:06:01 +01:00
Bernd Bestel
0245a925b7
Make it possible to hide columns ( closes #1058 )
...
Hide new overview page columns by default
2020-11-11 21:11:17 +01:00
Bernd Bestel
b15740bded
Fixed dropdown menu in tables overflow
2020-11-11 20:14:16 +01:00
Bernd Bestel
e3ab943fe7
Use the custom-file-pickers also for the new file and image userfields
2020-11-11 18:49:08 +01:00
Bernd Bestel
9c81fc890b
Simplified "checkboxUncheckedValue" handling
2020-11-11 17:34:37 +01:00
Bernd Bestel
d816be6908
Use the proper plural QU form in productamountpicker
2020-11-10 21:41:12 +01:00
Bernd Bestel
d863e33343
Made the sidebar items a little smaller
2020-11-10 21:35:01 +01:00
Bernd Bestel
7f600bd8d9
Don't add the destination QU multiple time in productamountpicker
2020-11-10 21:19:51 +01:00
Bernd Bestel
4959e9e732
Fixed purchase page initial amount validation
2020-11-10 21:19:28 +01:00
Bernd Bestel
3831cb37b3
Fixed DateTimePicker2 contextual time
2020-11-10 20:57:49 +01:00
Bernd Bestel
0c17666cef
Fixed default consume/purchase amount behaviour
2020-11-10 20:53:16 +01:00
Bernd Bestel
68eeb07e5f
Test/review/rework (and hopefully finalized) new price handling
2020-11-10 18:11:33 +01:00
Bernd Bestel
33a6a28208
Also use the productamountpicker on the shopping list item page (refernces #1015 )
2020-11-09 22:15:25 +01:00
Bernd Bestel
8400175f1d
Improved productamountpicker stock amount display
2020-11-09 21:55:49 +01:00
Bernd Bestel
b6f4cfa851
Also use the productamountpicker for inventory (refernces #1015 )
2020-11-09 21:51:55 +01:00
Bernd Bestel
ad3b91ef98
Improved form spacing
2020-11-09 21:30:22 +01:00
Bernd Bestel
8bd157ca9d
Use producamountpicker "everywhere" ( closes #1015 )
2020-11-09 19:25:46 +01:00
Bernd Bestel
5f920e2cc6
Start product picker workflows also by TAB
2020-11-08 22:36:55 +01:00
Bernd Bestel
ea5b3dcd51
UI test/review
2020-11-08 19:51:56 +01:00
Bernd Bestel
3e3321bf11
UI test/review
2020-11-08 19:00:12 +01:00
Bernd Bestel
d82fd09fba
UI test/review
2020-11-08 15:09:10 +01:00
4lloyd
76cbf796b6
[WIP] Simplified overviews on mobile ( #1115 )
...
* Simplified stock overview on mobile.
* Stock table horizontally scrollable
* Use the new mobile views for all pages (except the shopping list page, use the existing special handling there for now)
And add a clear filter button to all pages
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-11-07 14:53:45 +01:00
Bernd Bestel
7b32d1d8a4
More compact page headers / streamlined new page design for all pages
2020-10-31 18:37:10 +01:00
Benoit Anastay
5303952be1
Unit stock name in the mealplan ( #1109 )
...
Stock name instead of purchase name
2020-10-31 16:15:26 +01:00
Bernd Bestel
351e236353
Fixed initial state of user permission checkbox tree ( fixes #1099 )
2020-10-29 17:19:48 +01:00
kriddles
64a2f5b25e
dialogs for shopping list ( #1103 )
2020-10-29 17:09:35 +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
fipwmaqzufheoxq92ebc
7ef9ffe041
Fixes #1092 : Repair QR-Codes for API-Keys ( #1093 )
2020-10-25 08:42:58 +01:00
kriddles
ff254f8db2
stock entries button on product card ( #1079 )
2020-10-20 20:14:25 +02:00
kriddles
57aa6499eb
display productCard when clicking item on shopping list ( #1078 )
2020-10-20 20:14:11 +02: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
9e982979c3
Allow 4 decimals for all amount inputs (this now closes #998 )
2020-10-19 20:25:42 +02:00
Bernd Bestel
9115645e19
Fixed consuming tare weight handling enabled products on the stock entries page ( fixes #988 )
2020-10-18 14:51:32 +02:00
Bernd Bestel
80cf68aeaa
Allow no product for shopping list items & always in-/decrement by 1 when using the number input arrow buttons ( fixes #964 )
2020-10-18 14:27:23 +02:00
Bernd Bestel
7e08224c75
Fixed tooltip/model z-index ( fixes #1065 )
2020-10-18 14:13:39 +02:00
kriddles
f7a1634442
typo ( #1062 )
2020-10-18 13:57:10 +02:00
John M. Harris, Jr
2958ccfc14
Fix night mode ( #1067 )
...
This fixes a few lines of white when in night mode.
This change was done from a tablet, I can redo this commit properly on a computer when I get back home if needed. This just really annoyed me ;)
2020-10-18 13:54:33 +02:00
Bernd Bestel
e24f3143b5
Changelog/little naming changes/fixes/new translations strings for #1056
2020-10-17 11:03:47 +02:00
kriddles
cd65195532
add purchased date to purchase ( #1056 )
2020-10-17 10:54:10 +02:00
Bernd Bestel
235b96d17f
Fixed recipe ingredient initial QU ( fixes #1060 )
2020-10-17 10:52:25 +02:00
kriddles
758a8d9708
fix for price and total price ( #1057 )
...
* fix for price and total price
* product card clarity
2020-10-15 19:55:58 +02:00
kriddles
5ae36e6ba8
Value information ( #1045 )
...
* viewjs stockoverview: add total value to stock overview
* view stockoverview.blade: add Value column
* refresh stockOverview value column
* Removed the total units info
* Properly format the total stock value number
* Added new localization strings
* Resolved merge conflict
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-15 19:46:27 +02:00
Bernd Bestel
08644f95bf
Revert "Excape HTML (where needed, for bootbox) (references #996 )"
...
This reverts commit 0df2590de2#996 )"
This reverts commit 0624b0df59
2020-10-14 22:58:26 +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
SourceFactory.at
617b25bda8
added button to add expired products to shoppinglist ( #1026 )
...
* added button to add expired products to shoppinglist
* Localizations are managed via Transifex
Revert "added button to add expired products to shoppinglist"
This reverts commit ad1ab5d6a0
2020-10-04 15:20:34 +02:00
