kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 19:16:37 +00:00
Code Issues Projects Releases Wiki Activity
1,702 Commits 2 Branches 80 Tags
2bc108fe3ef95ad2fb41d34d18d2d3818c97da4d
Commit Graph

599 Commits

Author SHA1 Message Date
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
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
e85b21384f Remove "Allow partial units in stock" product option / unify number input validation messages 2020-11-16 17:10:41 +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
22e9e4e311 Forgot to save... 2020-11-15 14:59:54 +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
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
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