Commit Graph

199 Commits

Author SHA1 Message Date
zebardy
a88a9953bd bug fixes following merge 2020-02-19 01:56:35 +00:00
zebardy
5402319a2c bug fixes following merge 2020-02-19 01:32:30 +00:00
zebardy
a3cdb85317 bug fixes following merge 2020-02-19 00:24:01 +00:00
zebardy
b6be442fb9 updated to original master 2020-02-18 21:56:36 +00:00
Bernd Bestel
97095d6e68
Typo... 2020-02-09 17:33:02 +01:00
Bernd Bestel
785dd30724
Fixed that the wrong FEATURE_FLAG was used (references #552) 2020-02-09 17:28:49 +01:00
Bernd Bestel
1953a26d7f
Changelog and small changes for #552) 2020-02-09 17:27:46 +01:00
kriddles
13f99ad5f2
CalendarService reflect config options for GetEvents (#552) 2020-02-09 17:22:54 +01:00
Bernd Bestel
5d83ec7967
Typo 2020-01-27 22:17:19 +01:00
Bernd Bestel
e84c7063d3
Consume any subproduct when consuming a recipe ingredient which is not in stock (fixes #446) 2020-01-27 22:14:11 +01:00
Bernd Bestel
71a57c9dcb
Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
kriddles
ac1be1e90f 450 updates (#518)
* prevent seeing undefinde if no recipes

* disable weekRecipeConsume if weekCosts are zero

* reword title

* Add meal plan notes and products to Calendar
2020-01-26 08:50:44 +01:00
Bernd Bestel
fd5a72264d
Meal plan recipe and notes also fit into one table (references #477) 2020-01-23 21:57:47 +01:00
Bernd Bestel
99d4b05a3c
Make purchased date on /stockedit editable / Dirty workaround for 2 datetimepickers on the same page (references #506) 2020-01-23 18:58:05 +01:00
kriddles
3baffcfe7b typo (#511) 2020-01-23 09:34:17 +01:00
Bernd Bestel
6300a8fd09
Typo... 2020-01-22 22:36:01 +01:00
Bernd Bestel
ec2551d263
Little refinements for #507 2020-01-22 21:17:04 +01:00
kriddles
ef9f28d154 421 (#507)
* refactor to be stock/entry/{entryId}

* Allow recipeform add productworkflow

* on document ready stockdetail filter based on ProductPicker

* openDate fixes for undo

* RefreshStockDetailRow refresh location-id
2020-01-22 21:08:49 +01:00
Bernd Bestel
0816359867
Some refinements for #501 2020-01-21 20:45:34 +01:00
kriddles
3a36bdaf45 recipes can create products (#501) 2020-01-21 20:20:26 +01:00
Bernd Bestel
c22496ca7c
Fixed /stockedit opened checkbox (references #506) 2020-01-21 20:04:33 +01:00
Bernd Bestel
d0036e8034
Tried to simplify #503 (also references #487) 2020-01-19 09:52:23 +01:00
Grégory SACRE
61a45c030f Feature request : api/stock can return detailed products #487 (#503)
The response of the call '/api/stock' now returns a new attribute
('product') which contains the details of the related product.
2020-01-19 09:14:07 +01:00
kriddles
2a608c41e9 Stock detail updates (#493)
* Fix spelling

* stockdetail refresh with location name

* Stock updates

* change stock_row_id to id

* fix stockdetail refresh rows after clicking undo

* fix stockdetail consume spoiled
2020-01-17 17:54:34 +01:00
Bernd Bestel
8e26bd2c31
Allow partial units during inventory (fixes #459) 2020-01-03 13:55:14 +01:00
Aaron Moses
027b614050 Fix for start up bug. Re factoring singleton code had brroken due to scope of clas var. 2019-12-26 02:42:11 +00:00
Aaron Moses
a0e0870f1a More fixes following merge 2019-12-22 23:38:30 +00:00
Aaron Moses
8d4b8c91d7 fixes for things broken 2019-12-22 23:29:22 +00:00
Aaron Moses
146c7b6011 Merge branch 'master' of https://github.com/grocy/grocy into grocy-448 2019-12-22 23:28:50 +00:00
Aaron Moses
f12766ca19 Complete removal of acpu from localisation 2019-12-22 23:10:03 +00:00
Aaron Moses
2666cb7a41 remove acpu from localisation 2019-12-22 23:07:27 +00:00
Aaron Moses
ce75d6bca8 Clean up and tuen all services into singletons 2019-12-22 22:51:54 +00:00
kriddles
6c7420ea08 Stock Service Updates (#421)
* viewjs consume: implement location and update stock specific

* Transfer Products

* services StockService#GetProductStockEntriesByLocation: add method

* services StockService#AddProduct: check for stock and locations

* services StockService: include location_id

* services StockService#LocationExists: add method

* services StockService#UndoBooking: fix based on stockRow

* Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id)

* Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty)

* Only consider stock amount at the given location on consume, if supplied

* Restore more/old display text for "specific stock entry"

* Don't allow transfering tare weight enabled products

* Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking)

* Updated translations strings

* Added transaction_id and correlation_id to stock_log entries to group them together

* ProductCard - location to default location label change

* Also undo correlated bookings on undo

* Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview

* Initial Stock detail page

* Allow Undo for Tranfers

* Price step to .01

* Some localization string changes & fixes
2019-12-19 19:48:36 +01:00
zebardy
35e88ba5f1 fix calendar service 2019-11-23 21:15:54 +00:00
zebardy
90c00680fa fix chores service 2019-11-23 20:47:42 +00:00
zebardy
5b214dbf27 fix userfieldservice 2019-11-23 19:24:14 +00:00
zebardy
fce767b0ad fix userservice 2019-11-23 17:48:19 +00:00
zebardy
a4c9239214 correct mistake 2019-11-23 17:13:03 +00:00
zebardy
f8dffbac4c lazy loading of services in services 2019-11-23 16:45:15 +00:00
zebardy
8b9790417d lazy loading of open api spec 2019-11-23 14:38:37 +00:00
zebardy
62d3015509 correct scope of variable 2019-11-23 13:20:57 +00:00
zebardy
86c577c7c0 correct scope for Pot variable 2019-11-21 18:56:40 +00:00
zebardy
aabc719f5b correct indentation and variable out of scope 2019-11-21 15:51:18 +00:00
zebardy
1b458dcbd0 forgot to uncomment instance map 2019-11-21 14:50:31 +00:00
zebardy
4f6db32ba9 correct syntax error 2019-11-21 11:06:07 +00:00
zebardy
9d131ee334 stor translations in apcu instead of localisation service (due to database connection) 2019-11-21 09:06:31 +00:00
zebardy
1d9e69dbda store localisation service in apcu 2019-11-20 22:14:47 +00:00
zebardy
06e210a0b9 try storing app in apcu 2019-11-18 22:07:52 +00:00
zebardy
962c6e9eea fix errent line that should have been commented 2019-11-17 21:49:45 +00:00
zebardy
9f277f51b3 utilise Localisation service as a singleton 2019-11-17 19:25:56 +00:00