Pulled translations from Transifex

This reverts commit 59cd4dbac4.

.devtools/transifex_download.bat

@@ -1,4 +1,9 @@
 pushd ..
-tx pull --all --minimum-perc=90
+tx pull --all --minimum-perc=80
 tx pull --language en_GB
+copy /Y localization\en\userfield_types.po localization\en_GB\userfield_types.po
+copy /Y localization\en\stock_transaction_types.po localization\en_GB\stock_transaction_types.po
+copy /Y localization\en\component_translations.po localization\en_GB\component_translations.po
+copy /Y localization\en\chore_period_types.po localization\en_GB\chore_period_types.po
+copy /Y localization\en\chore_assignment_types.po localization\en_GB\chore_assignment_types.po
 popd

.devtools/update_dependencies.bat

@@ -1,4 +1,4 @@
 pushd ..
 call composer update
-yarn upgrade
+yarn upgrade --latest
 popd

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+*.sh text eol=lf

.tx/config

@@ -1,9 +1,15 @@
 [main]
 host = https://www.transifex.com
 
-[grocy.chore_types]
-file_filter = localization/<lang>/chore_types.po
-source_file = localization/chore_types.pot
+[grocy.chore_period_types]
+file_filter = localization/<lang>/chore_period_types.po
+source_file = localization/chore_period_types.pot
+source_lang = en
+type = PO
+
+[grocy.chore_assignment_types]
+file_filter = localization/<lang>/chore_assignment_types.po
+source_file = localization/chore_assignment_types.pot
 source_lang = en
 type = PO
 

README.md

@@ -2,57 +2,67 @@
 ERP beyond your fridge
 
 ## Give it a try
-- Public demo of the latest stable version → [https://demo.grocy.info](https://demo.grocy.info)
-- Public demo of the latest pre-release version (current master branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
+- Public demo of the latest stable version (`release` branch) → [https://demo.grocy.info](https://demo.grocy.info)
+- Public demo of the latest pre-release version (`master` branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
 
-## Getting in touch
-There is the [r/grocy subreddit](https://www.reddit.com/r/grocy) to connect with other grocy users. If you've found something that does not work or if you have an idea for an improvement or new things which you would find useful, feel free to open an issue in the [issue tracker](https://github.com/grocy/grocy/issues) here.
+## Questions / Help / Bug reporting / Feature requests
+There is the [r/grocy subreddit](https://www.reddit.com/r/grocy) to connect with other grocy users and getting help.
+
+If you've found something that does not work or if you have an idea for an improvement or new things which you would find useful, feel free to open an issue in the [issue tracker](https://github.com/grocy/grocy/issues) here.
+
+## Community contributions
+See the website for a list of community contributed Add-ons / Tools: [https://grocy.info/#addons](https://grocy.info/#addons)
 
 ## Motivation
 A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
 
 ## How to install
-> **NEW**
->
-> There is now grocy-desktop if you want to run grocy without a webserver just like a normal (windows) desktop application.
+> Checkout grocy-desktop, if you want to run grocy without a webserver just like a normal (windows) desktop application.
 >
 > See https://github.com/grocy/grocy-desktop or directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next"...
 
-Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite (3.8.3 or higher) extension required, currently only tested with PHP 7.2) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make writable `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
+Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite (3.8.3 or higher) extension required, currently only tested with PHP 7.4) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make it writable, maybe use `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
 
-Alternatively clone this repository and install Composer and Yarn dependencies manually.
+Alternatively clone this repository (the `release` branch always references the latest released version, or checkout the latest tagged revision) and install Composer and Yarn dependencies manually.
 
-If you use nginx as your webserver, please include `try_files $uri /index.php;` in your location block.
+If you use nginx as your webserver, please include `try_files $uri /index.php$is_args$query_string;` in your location block.
 
 If, however, your webserver does not support URL rewriting, set `DISABLE_URL_REWRITING` in `data/config.php` (`Setting('DISABLE_URL_REWRITING', true);`).
 
+See the website for further installation guides and troubleshooting help: https://grocy.info/links
+
 ## How to run using Docker
 
-See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) for instructions.
+See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) or [linuxserver/docker-grocy](https://github.com/linuxserver/docker-grocy) for instructions.
 
 ## How to update
-Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
+Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` where appropriate (the default values from `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
 
-If you run grocy on Linux, there is also `update.sh` (remember to make the script executable, `chmod +x update.sh` and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
+If you run grocy on Linux, there is also `update.sh` (remember to make the script executable (`chmod +x update.sh`) and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
 
 ## Localization
 grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me.
 You can easily help translating grocy at https://www.transifex.com/grocy/grocy, if your language is incomplete or not available yet.
 (Language can be changed in `data/config.php`, e. g. `Setting('CULTURE', 'it');`)
 
-### Maintaining your own localization
-As the German translation will always be the most complete one, for maintaining your localization it would be easiest when you compare your localization with the German one with a diff tool of your choice.
+The [pre-release demo](https://demo-prerelease.grocy.info) is available for any translation which is at least 80 % complete and will pull the translations from Transifex 10 minutes past every hour, so you can have a kind of instant preview of your contributed translations. Thank you!
+
+Also any translation which reached a completion level of 80 % will be included in releases.
 
 ## Things worth to know
 
 ### REST API & data model documentation
-See the integrated Swagger UI instance on [/api](https://demo-en.grocy.info/api).
+See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
 
-### Barcode readers
-Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+### Barcode readers & camera scanning
+Some fields (with a barcode icon above) also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+
+Additionally it's also possible to use your device camera to scan a barcode by using the camera button on the right side of the corresponding field (powered by [QuaggaJS](https://github.com/serratus/quaggaJS), totally offline / client-side camera stream processing, please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)). Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
+
+My personal recommendation: Use a USB barcode laser scanner. They are cheap and work 1000 % better, faster, under any lighting condition and from any angle.
 
 ### Input shorthands for date fields
-For (productivity) reasons all date (and time) input fields use the ISO-8601 format regardless of localization.
+For (productivity) reasons all date (and time) input (and display) fields use the ISO-8601 format regardless of localization.
 The following shorthands are available:
 - `MMDD` gets expanded to the given day on the current year, if > today, or to the given day next year, if < today, in proper notation
   - Example: `0517` will be converted to `2018-05-17`
@@ -61,8 +71,10 @@ The following shorthands are available:
 - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
   - Example: `201807e` will be converted to `2018-07-31`
 - `x` gets expanded to `2999-12-31` (which I use for products which never expire)
-- Down/up arrow keys will increase/decrease the date by one day
+- Down/up arrow keys will increase/decrease the date by 1 day
 - Right/left arrow keys will increase/decrease the date by 1 week
+- Shift + down/up arrow keys will increase/decrease the date by 1 month
+- Shift + right/left arrow keys will increase/decrease the date by 1 year
 
 ### Keyboard shorthands for buttons
 Wherever a button contains a bold highlighted letter, this is a shortcut key.
@@ -84,17 +96,20 @@ If you don't use certain feature sets of grocy (for example if you don't need "C
 - When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
 
 ### Demo mode
-When the file `data/demo.txt` exists, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
+When the `MODE` setting is set to `dev`, `demo` or `prerelease`, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
 
 ### Embedded mode
 When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [grocy-desktop](https://github.com/grocy/grocy-desktop)).
 
 In embedded mode, settings can be overridden by text files in `data/settingoverrides`, the file name must be `<SettingName>.txt` (e. g. `BASE_URL.txt`) and the content must be the setting value (normally one single line).
 
-## Contributing
+## Contributing / Say thanks
 Any help is more than appreciated. Feel free to pick any open unassigned issue and submit a pull request, but please leave a short comment or assign the issue yourself, to avoid working on the same thing.
 
-New ideas are also very welcome, feel free to open an issue to discuss them.
+See https://grocy.info/#say-thanks for more ideas if you just want to say thanks.
+
+## Roadmap
+There is none. grocy is only my hobby, one I like, but not the only one, and because of that, there are no release dates, no schedules for when anything is ready, it's done when it's done, maybe tomorrow, maybe tomorrow next year, everyone is invited to contribute - I appreciate all ideas and contributions. The progress of a specific bug/enhancement is always tracked in the corresponding issue, at least by commit comment references.
 
 ## Screenshots
 #### Dashboard

app.php

@@ -1,10 +1,12 @@
 <?php
 
-use \Psr\Http\Message\ServerRequestInterface as Request;
-use \Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Container\ContainerInterface as Container;
+use Slim\Factory\AppFactory;
 
-use \Grocy\Helpers\UrlManager;
-use \Grocy\Controllers\LoginController;
+use Grocy\Helpers\UrlManager;
+use Grocy\Controllers\LoginController;
 
 // Definitions for embedded mode
 if (file_exists(__DIR__ . '/embedded.txt'))
@@ -19,26 +21,18 @@ else
 	define('GROCY_DATAPATH', __DIR__ . '/data');
 }
 
-// Definitions for demo mode
-if (file_exists(GROCY_DATAPATH . '/demo.txt'))
-{
-	define('GROCY_IS_DEMO_INSTALL', true);
-	if (!defined('GROCY_USER_ID'))
-	{
-		define('GROCY_USER_ID', 1);
-	}
-}
-else
-{
-	define('GROCY_IS_DEMO_INSTALL', false);
-}
-
 // Load composer dependencies
 require_once __DIR__ . '/vendor/autoload.php';
 
 // Load config files
 require_once GROCY_DATAPATH . '/config.php';
-require_once __DIR__ . '/config-dist.php'; //For not in own config defined values we use the default ones
+require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
+
+// Definitions for dev/demo/prerelease mode
+if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
+{
+	define('GROCY_USER_ID', 1);
+}
 
 // Definitions for disabled authentication mode
 if (GROCY_DISABLE_AUTH === true)
@@ -50,31 +44,38 @@ if (GROCY_DISABLE_AUTH === true)
 }
 
 // Setup base application
-$appContainer = new \Slim\Container([
-	'settings' => [
-		'displayErrorDetails' => true,
-		'determineRouteBeforeAppMiddleware' => true
-	],
-	'view' => function($container)
-	{
-		return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
-	},
-	'LoginControllerInstance' => function($container)
-	{
-		return new LoginController($container, 'grocy_session');
-	},
-	'UrlManager' => function($container)
-	{
-		return new UrlManager(GROCY_BASE_URL);
-	},
-	'ApiKeyHeaderName' => function($container)
-	{
-		return 'GROCY-API-KEY';
-	}
-]);
-$app = new \Slim\App($appContainer);
+AppFactory::setContainer(new DI\Container());
+$app = AppFactory::create();
+
+$container = $app->getContainer();
+$container->set('view', function(Container $container)
+{
+	return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+});
+$container->set('LoginControllerInstance', function(Container $container)
+{
+	return new LoginController($container, 'grocy_session');
+});
+$container->set('UrlManager', function(Container $container)
+{
+	return new UrlManager(GROCY_BASE_URL);
+});
+$container->set('ApiKeyHeaderName', function(Container $container)
+{
+	return 'GROCY-API-KEY';
+});
 
 // Load routes from separate file
 require_once __DIR__ . '/routes.php';
 
+// Set base path if defined
+if (!empty(GROCY_BASE_PATH))
+{
+	$app->setBasePath(GROCY_BASE_PATH);
+}
+
+// Add default middleware
+$app->addRoutingMiddleware();
+$app->addErrorMiddleware(true, false, false);
+
 $app->run();

changelog/18_1.9.0_2018-04-21.md

@@ -1 +1 @@
-- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo-en.grocy.info/api)
+- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo.grocy.info/api)

changelog/25_1.13.0_2018-07-12.md

@@ -1,3 +1,3 @@
 - Upgraded Bootstrap and some other dependencies (grocy now looks even better!)
 - Added Italian translation (thanks @davidoskky)
-  - => Demo for this language available at: https://demo-it.grocy.info
+  - => Demo for this language available at: https://it.demo.grocy.info

changelog/26_1.13.1_2018-07-12.md

@@ -2,4 +2,4 @@ This was released shortly after the last release to fix a small regression bug,
 
 - Upgraded Bootstrap and some other dependencies (grocy now looks even better!)
 - Added Italian translation (thanks @davidoskky)
-  - => Demo for this language available at: https://demo-it.grocy.info
+  - => Demo for this language available at: https://it.demo.grocy.info

changelog/27_1.14.0_2018-07-15.md

@@ -1,8 +1,8 @@
 - New feature: **Recipes**
   - Organize a list of products, amounts and a description into recipes and see at a glance if everything needed is in stock or put the missing things with one click on the shopping list
-  - Try it live on the demo page: => https://demo-en.grocy.info/recipes
+  - Try it live on the demo page: => https://demo.grocy.info/recipes
 - Added norwegian translation (thanks @BlizzWave)
-  - Demo available at: => https://demo-no.grocy.info
+  - Demo available at: => https://no.demo.grocy.info
 - A lot of small UI improvements
   - Columns in tables can now be reordered
   - Show a calendar on the shopping list page (useful, at least for me)

changelog/39_1.23.0_2018-11-24.md

@@ -9,7 +9,7 @@
 - New feature: Calendar
   - Shows all upcoming product expirations, due chores, due tasks and due battery charge cycles
 - New translation: French (thanks all the translators)
-  - As for all languages, a demo is available at: https://demo-fr.grocy.info
+  - As for all languages, a demo is available at: https://fr.demo.grocy.info
 - Small other improvements
   - Allow fraction numbers for recipe ingredients when not checked against stock and add an option to not check stock for a recipe position
   - The current time can now be shown in the header (see the settings menu next to the user icon)

changelog/43_2.0.0_2019-03-06.md

@@ -1,4 +1,4 @@
-- Breaking change: The API has been completely reworked, please review [the documentation](https://demo-en.grocy.info/api) before updating when you are using the API
+- Breaking change: The API has been completely reworked, please review [the documentation](https://demo.grocy.info/api) before updating when you are using the API
 - New feature: Tare weight handling
   - An option per product
   - Imagine this: You have flour in jars, the jar weighs 500 grams, currently there are 1000 grams in stock, the new weight including the jar is 1100 grams - grocy can now calculate the used amount on consume/purchase/inventory automatically, you only have to enter the weighed amount including the jar (demo product to showcase this "Flour")
@@ -9,13 +9,13 @@
   - A new option per recipe to not check against the amount already on the shopping list when putting all missing ingredients on it (by default, only the amount not already on the shopping list is added, when this is enabled, always the whole missing amount will be put on the shopping list)
   - On consume, there can now be tracked for which recipe it was, this is also tracked automatically when using the "Consume all ingredients needed by this recipe" button (for future statistical purposes)
   - Recipes can now have pictures
-  - New "gallery view" for recipes (demo available at https://demo-en.grocy.info/recipes?tab=gallery)
+  - New "gallery view" for recipes (demo available at https://demo.grocy.info/recipes?tab=gallery)
 - Stock improvements
   - It is now optionally possible to have partial units in stock (option per product)
   - On purchase, a different location can now be assigned (imagine you have two freezers, by default you store your pizza there, but sometimes there)
 - New translations: (thanks all the translators)
-  - Spanish (demo available at https://demo-es.grocy.info)
-  - Turkish (demo available at https://demo-tr.grocy.info)
+  - Spanish (demo available at https://es.demo.grocy.info)
+  - Turkish (demo available at https://tr.demo.grocy.info)
 - Other improvements
   - The calendar can now be shared/integrated in iCal format (button in the header on the calendar page)
   - Added feature flags to hide/disable certain parts of grocy when you don't use them (for example hide "Chores" and all related UI elements, when you don't use it, see `config-dist.php`)

changelog/44_2.1.0_2019-03-09.md

@@ -7,4 +7,4 @@
   - The changelog is now included as markdown files (in `/changelog` directory, one file per release with a filename in format `<ReleaseNumber>_<Version>_<ReleaseDateIso>.md`) and shown in the about dialog
   - Please review your `CURRENCY` setting in `data/config.php`, see also `config-dist.php` - this should be the ISO 4217 code of the currency to properly work with the JS `toLocaleString` function
 - New translation: (thanks all the translators)
-  - Russian (demo available at https://demo-ru.grocy.info)
+  - Russian (demo available at https://ru.demo.grocy.info)

changelog/47_2.4.0_2019-05-10.md

@@ -21,8 +21,8 @@
 - Recipe improvements
   - It's now possible to enter a "variable amount" (e. g. if a recipe needs "1 - 2 cups"), the original amount is still used for stock fulfillment checking (if enabled for that recipe ingredient)
 - New translations: (thanks all the translators)
-  - Swedish (demo available at https://demo-sv.grocy.info)
-  - Polish (demo available at https://demo-pl.grocy.info)
+  - Swedish (demo available at https://sv.demo.grocy.info)
+  - Polish (demo available at https://pl.demo.grocy.info)
 - Internal improvement: Localizations are now handled via gettext, both on server and client side
   - Mainly to properly handle languages with more than 2 plural forms
   - This involved some string changes which results in a needed (re)translation of about 20 strings (excluding demo data)

changelog/51_2.4.4_2019-07-07.md

@@ -0,0 +1,6 @@
+- Fixed that price data (last price & chart) was not taken from inventory correction bookings, only purchases
+- Fixed weekly chores were scheduled on the same day after execution
+- Fixed that undone chores were also included in "Last tracked"
+- Fixed the date-time-picker width was too narrow sometimes
+- Improved that execution dates of "Track date only" chores will never display the time part
+- Improved date display for products that never expire (again, there was a display problem after consuming an item on the stock overview page)

changelog/52_2.5.0_2019-09-22.md

@@ -0,0 +1,107 @@
+### New feature: Custom entities / objects / lists
+- Custom entities are based on Userfields and can be used to add any custom lists you want to have in grocy
+- They can have an own menu entry in the sidebar
+- => See "Manage master data" -> "Userentities" or try it on the demo: https://demo.grocy.info/userobjects/exampleuserentity
+
+### New feature: Use the device camera for barcode scanning
+- Available on any barcode-enabled field (so currently only for picking products) - a new camera button at the right of side the text field
+- Implemented using [QuaggaJS](https://github.com/serratus/quaggaJS) - camera stream processing happens totally offline / client-side
+- Please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)
+- There is also a `config.php` setting `DISABLE_BROWSER_BARCODE_CAMERA_SCANNING` to disable this, if you don't need it at all (defaults to `false`)
+- I you have problems that barcodes are not recognized properly, there is a little "barcode scanner testing page" at [/barcodescannertesting](https://demo.grocy.info/barcodescannertesting)
+- => Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
+
+### Stock improvements/fixes
+- Products can now have variations (nested products)
+  - Define the parent product for a product on the product edit page (only one level is possible, means a product which is used as a parent product in another product, cannot have a parent product itself)
+  - Parent and sub products can have stock (both are regular products, no difference from that side)
+  - On the stock overview page, the aggregated amount is displayed next to the amount (sigma sign)
+  - When a recipe needs a parent product, the need is also fulfilled when enough sub product(s) are in stock
+- Quantity units can now be linked (related measurements / unit conversion)
+  - On the quantity unit edit page default conversion can be defined for each unit
+  - Products "inherit" the default conversion and additionally can have their own / override the default ones
+- It's now possible to print a "Location Content Sheet" with the current stock per location - new button at the top of the stock overview page (thought to hang it at the location, note used amounts on paper and track it in grocy later)
+- Stock overview page improvements
+  - Options in the more/context-menu to directly open the purchase/consume/inventory pages prefilled with the current product in a popup/dialog
+  - Option in the more/context-menu to add the current product directly to a shopping list
+  - Option in the more/context-menu to search for recipes containing the current product
+  - It's now possible to undo stock bookings ("Undo"-button in the success message, like it was already possible on the purchase/consume/inventory pages)
+  - Improved that on any stock changes the corresponding product table row is properly refreshed
+- New `config.php` setting `FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT` to configure if opened products should be considered for minimum stock amounts (defaults to `true`, so opened products will now be considered missing by default - please change this setting if you want the old behavior)
+- The product description now can have formattings (HTML/WYSIWYG editor like for recipes)
+- Products now have a new field for calories (kcal, per stock quantity unit)
+- "Factor purchase to stock quantity unit" (product option) can now also be a decimal number when "Allow partial units in stock" is enabled
+- New "Sub feature flags" in `config.php` to disable some sub-features (hide the corresponding UI elements) if you don't need them (all new feature flags default to `true`, so no changed behavior when not configured)
+  - `FEATURE_FLAG_STOCK_PRICE_TRACKING` to disable product price tracking
+  - `FEATURE_FLAG_STOCK_LOCATION_TRACKING` to disable product location tracking
+  - `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` to disable product best before date tracking
+  - `FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING` to disable product opened tracking
+- Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling (nothing was broken, but the success popups may not displayed the correct amount that was posted)
+- Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases
+- When going to the product edit page, after saving the product, it will now always return to the previous page
+
+### Shopping list improvements
+- Shopping lists now have a notes field (HTML/WYSIWYG editor, just to save some notes per shopping list)
+- Shopping lists can now be printed (new button next to the add/delete shopping list button)
+
+### Recipe improvements
+- Based on the new linked quantity units, recipe ingredients can now use any product related unit, the amount is calculated according to the conversion factor of the unit relation
+- Based on the new calories field per product, the calories per recipe are now shown based on the selected servings (in the header, next to the costs)
+- New option "price factor" per recipe ingredient (defaults to `1`) - the resulting costs of the recipe ingredient will be multiplied by that factor
+  - Use this for example for spices in combination with "Only check if a single unit is in stock" to not take the full price of a pack of pepper into account for a recipe
+- The search field on the recipe overview page now also searches for product names of recipe ingredients (means it's possible to search a recipe by a product name)
+- Fixed a problem where the meal plan did not load when a recipe, which was already added to the meal plan, was deleted
+
+### Chores improvements
+- Chores can now be assigned to users
+  - Option per chore, different "assignment types" like "Random", "Who least did first", etc.
+  - On the chores overview page, the list can be filtered to only show chores assigned to the currently logged in user (or to any other user)
+- New option "Due date rollover" per chore which means the chore can never be overdue, the due date will shift forward each day when due
+- New option "Consume product on chore execution" per chore to automatically consume a product when a chore execution is tracked
+- When tracking an execution from the chores overview page, filters are re-applied afterwards (means when you have filtered the page to only show overdue chores and after the execution the chore is not overdue anymore, it will now be immediately hidden)
+
+### Equipment improvements/fixes
+- Fixed that the delete button not always deleted the currently selected equipment item
+
+### Userfield improvements/fixes
+- New Userfield type "Select list" for a list of predefined values where a single or also multiple values can then be selected on the entity object
+- New Userfield type "Link" - a single-line-textbox where the content will be rendered as a clickable link
+- Userfields of type "checkbox" are rendered as a checkmark in tables when checked (instead of "1" as till now)
+- Product Userfields are now also rendered on the shopping list (for items which have a product referenced)
+- Fixed that the Userfield type "Preset list" had always the caption "Product group" instead of the configured one (thanks @oncleben31)
+
+### General & other improvements/fixes
+- Added a new `config.php` setting `CALENDAR_SHOW_WEEK_OF_YEAR` to configure if calendars should show week numbers (defaults to `true`)
+- Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
+- Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
+- Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret)
+- All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times (this requires the `php-gd` extension, if not installed, images will not be downscaled)
+- It's now possible to test plural forms of quantity units (button on the quantity unit edit page, only visible if the current language requires more than 2 plural forms)
+- On the login page the sidebar an all top-navbar menus is now hidden
+- New translations: (thanks all the translators)
+  - Danish (demo available at https://da.demo.grocy.info)
+  - Dutch (demo available at https://nl.demo.grocy.info)
+- Internal change for how the localizations for the demo instances are handled
+  - For the pre-release demo now all currently supported languages are available (was already the case for the stable demo)
+    - Additionally all language files which reached the completion limit of 80 % will now be automatically pulled from Transifex 10 minutes past every hour (to have a kind of instant preview of changed translations)
+  - The URLs have changed, I'll try to keep all existing URLs redirecting properly for a long time
+    - If you want to link to the demo, please only use https://demo.grocy.info (stable demo) or https://demo-prerelease.grocy.info (current master branch demo)
+
+### API improvements & non-breaking changes
+- New endpoint `/objects/{entity}/search/{searchString}` to search for objects by name (contains search)
+- New endpoint `/stock/shoppinglist/add-product` to add a product to a shopping list (thanks @Forceu)
+- New endpoint `/stock/shoppinglist/remove-product` to remove a product from a shopping list (thanks @Forceu)
+- New endpoint `/chores/executions/calculate-next-assignments` to (re)calculate next user assignments for a single or all chores
+- New endpoint `/stock/products/by-barcode/{barcode}/add` to add a product to stock by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/consume` to remove a product to stock by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/inventory` to inventory a product by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/open` to mark a product as opened by its barcode
+- New endpoint `/stock/bookings/{bookingId}` to retrieve a single stock booking
+- Endpoint `GET /files/{group}/{fileName}` can now also downscale pictures (see API documentation on [/api](https://demo.grocy.info/api))
+- When adding a product (through `stock/product/{productId}/add` or `stock/product/{productId}/inventory`) with omitted best before date and if the given product has "Default best before days" set, the best before date is calculated based on that (so far always today was used which is still the case when no date is supplied and also the product has no "Default best before days set) (thanks @Forceu)
+- Field `stock_amount` of endpoint `/stock/products/{productId}` now returns `0` instead of `null` when the given product is not in stock (thanks @Forceu)
+- Fixed that `/system/db-changed-time` always returned the current time (more or less) due to that that time is the database file modification time and the database is effectively changed on each request because of session information tracking - which now explicitly does not change the database file modification time, so this should work again to determine if any data changes happened
+- It's now also possible to provide the API key via a query parameter (same name as the header, so `GROCY-API-KEY`)
+
+#### Say thanks
+Because there were some questions about that in the past: If grocy is useful for you, [say thanks](https://grocy.info/#say-thanks)!

changelog/53_2.5.1_2019-09-28.md

@@ -0,0 +1,37 @@
+### Stock improvements/fixes
+- Fixed that barcode lookups now compare the whole barcode, not parts of it (e. g. when you have two products with the barcodes `$1` and `$10` and scan `$1` maybe the product of `$10` was found till now)
+- Fixed that the "X products are already expired" count on the stock overview page was wrong
+- Fixed that after product actions (consume/purchase/etc.) on the stock overview page the highlighting of the row was maybe wrong
+- After product actions (consume/purchase/etc.) on the stock overview page on a sub product, now also the parent product (row) is refreshed
+- It's now possible to accumulate min. stock amounts on parent product level (new option per product, means the sub product will never be "missing" then, only the parent product)
+- On the purchase page there is now an option to select that the price is the total price (for the whole amount) - below the price field, defaults to "Unit price" (as it was until now), when set to "Total price", the entered price will be divided by the amount before posting
+- "Average shelf life" on the product card now displays just "Unlimited" when the resulting value would be > 200 years (for products which never expire, as they have a best before date of 2999-12-31)
+
+### Shopping list improvements
+- When adding a product to the shopping list from the new context/more menu from the stock overview page and if the product is already on the shopping list, the amount of that entry will be updated acccordingly instead of adding a new (double) shopping list item
+- Added a "clear" button above the new notes field on the shopping list page to quickly clear the notes field with one click
+
+### Recipe improvements/fixes
+- Fixed a problem regarding quantity unit conversion handling for recipe ingredients of products with no unit relations, but only a different purchase/stock quantity unit
+- It's now possible to display a recipe directly from the meal plan (new "eye button") (thanks @kriddles)
+- Improved the responsiveness of the meal plan and calendar page by automatically switching to a day calendar view on smaller screens (thanks for the idea @kriddles)
+
+### Chores improvements
+- There is now a new sub feature flag `FEATURE_FLAG_CHORES_ASSIGNMENTS` to disable chore assignments if you don't need them (defaults to `true`, so no changed behavior when not configured)
+
+### Calendar improvements
+- The calendar now also contains all planned recipes from the meal plan on the corresponding day
+- Improved that dates in the iCal calendar export now include the server timezone
+
+### Custom lists/fields improvements
+- Optimized the custom lists page that it can be printed properly (search field etc. is hidden when printing the page)
+
+### General & other improvements/fixes
+- Fixed that the browser barcode scanner button was not clickable on iOS Safari & other small styles fixes/improvements for iOS Safari (thanks @DeeeeLAN)
+- It's now also possible to set the meal plan page as the default/entry page (`config.php` setting `ENTRY_PAGE`) (thanks @lwis)
+- Some UI detail-refinements
+- In the header of the product-/chore-/battery-card there is now also a button to directly jump to the journal of the current product/chore/battery
+
+### API improvements/fixes
+- The API Endpoint `GET /files/{group}/{fileName}` now also returns a `Cache-Control` header (defaults fixed to 30 days) to further increase page load times
+- Fixed that the API endpoint `/stock/shoppinglist/add-product` failed when a product should be added which was not already on the shopping list (thanks @Forceu)

changelog/54_2.5.2_2019-10-05.md

@@ -0,0 +1,15 @@
+### Stock fixes
+- Fixed that product specific quantity unit conversions (product overrides) were also displayed on the product edit page of other products with the same stock quantity unit
+
+### Recipe fixes
+- Fixed that recipes were displayed without ingredients if the total recipe count was > 100
+
+### Shopping list improvements
+- Added a new sub feature flag `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` to disable multiple shopping lists if you only need one (defaults to `true`, so no changed behavior when not configured)
+
+### Chores improvements
+- Added a new period type "yearly" (for yearly schedules)
+- Added a "period interval" option per chore to have more flexible schedules (possible for the daily/weekly/monthly/yearly schedules, means "schedule this chore only every x days/weeks/months" to have for example biweekly schedules)
+
+### General & other improvements
+- New Input shorthands for date fields to increase/decrease the date by 1 month/year (shift + arrow keys, see the full list [here](https://github.com/grocy/grocy#input-shorthands-for-date-fields))

changelog/55_2.6.0_2020-01-31.md

@@ -0,0 +1,85 @@
+### New feature: Transfer products between locations and edit stock entries
+- New menu entry in the sidebar to transfer products (or as a shortcut in the more/context menu per line on the stock overview page)
+- New button "Stock entries" in the header of the stock overview page (or as a shortcut in the more/context menu per line) to show the detail stock entries behind each product
+  - From there you can also edit the stock entries
+- (A huge THANK YOU goes to @kriddles for the work on this feature)
+
+### New feature: Scan mode
+- Just scan one product after another, no manual input required and audio feedback is provided
+- New switch-button on the purchase and consume page
+- When enabled
+  - The amount will always be filled with `1` after changing/scanning a product
+  - If all fields could be automatically populated (means for purchase the product has a default best before date set), the transaction is automatically submitted
+    - If not, a warning is displayed and you can fill in the missing information
+  - Audio feedback is provided after scanning and on success/error of the transaction
+- => Quick video demo: https://www.youtube.com/watch?v=83dm9iD718k
+
+### New feature: Self produced products
+- To a recipe a product can be attached
+  - This products needs a "Default best before date"
+- On using "Consume all ingredients needed by this recipe" and when it has a product attached, one unit of that product (per serving in purchase quantity unit) will be added to stock (with the proper price based on the recipe ingredients)
+- (Thanks @kriddles for the intial work on this)
+
+### New feature: Freeze/Thaw products
+- New product options "Default best before days after freezing/thawing" to set how the best before date should be changed on freezing/thawing
+- New location option "Is freezer" to indicate if the location is a freezer
+- => When moving a product from/to a freezer location, the best before date is changed accordingly
+- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
+
+### Stock improvements/fixes
+- The productcard gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
+- The product field calories (kcal) now also allows decimal numbers
+- On the inventory page, "New amount" is now prefilled with the current stock amount of the selected product
+- Fixed that entering partial amounts was not possible on the inventory page (only applies if the product option "Allow partial units in stock" is enabled)
+- Fixed that on purchase a wrong minimum amount was enforced for products with enabled tare weight handling in combination with different purchase/stock quantity units
+- Fixed that the productcard did not load correctly when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false` (thanks @kriddles)
+- Fixed that the "Add as barcode to existing product" workflow did not work twice when not switching the page inbetween
+
+### Shopping list improvements/fixes
+- Added a compact view to have a better shopping list for shopping trips (new button "Compact view" in the header, additionally this is automatically enabled on mobile devices / when screen width is < 768 px)
+- It's now possible to filter for only undone (not striked through) items (new option in the "Filter by status" dropdown)
+- Fixed that when `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` was set to `false`, the shopping list appeared empty after some actions
+
+### Recipe improvements
+- When consuming a recipe and if an ingredient is not in stock, but that product has any subproduct which is in stock, this gets now consumed (before consuming was not possible in that case)
+- When adding or editing a recipe ingredient, a dialog is now used instead of switching between pages (thanks @kriddles)
+
+### Meal plan improvements/fixes
+- It's now possible to add notes per day (in the dropdown of the add button in the header of each day column)
+- It's now possible to products directly (also in the dropdown of the add button in the header of each day column, maybe useful in combination with the new "Self produced products" feature)
+- Added that the calories per serving are now also shown
+- Added that the total costs and calories per day are displayed in the header of each day column
+- Added a new `config.php` setting `MEAL_PLAN_FIRST_DAY_OF_WEEK` which can be used to start the meal plan on a different day (defaults to `CALENDAR_FIRST_DAY_OF_WEEK`, so no changed behavior when not configured)
+- Fixed that when `FEATURE_FLAG_STOCK_PRICE_TRACKING` was set to `false`, prices were still shown (thanks @kriddles)
+- Fixed that the week costs were missing for the weeks 1 - 9 of a year
+
+### Calendar improvements
+- Improved that meal plan events in the iCal calendar export now contain a link to the appropriate meal plan week in the body of the event (thanks @kriddles)
+
+### Task fixes
+- Fixed that a due date was required when editing an existing task
+
+### API improvements/fixes
+- The endpoint `/stock` now includes also the product object itself (new field/property `product`) (thanks @gsacre)
+- The endpoint `/stock/products/{productId}/entries` can now include stock entries of child products (if the given product is a parent product and in addition to the ones of the given product) - new query parameter `include_sub_products` (defaults to `false` so no changed behavior when not supplied)
+- New endpoints for the new stock transfer & stock entry edit capabilities
+- Fixed that the route `/stock/barcodes/external-lookup/{barcode}` did not work, because the `barcode` argument was expected as a route argument but the route was missing it (thanks @Mikhail5555 and @beetle442002)
+- Fixed the response type description of the `/stock/volatile` endpoint
+
+### General & other improvements/fixes
+- It's now possible to keep the screen on always or when a "fullscreen-card" (e. g. used for recipes) is displayed
+  - New user options in the display settings menu in the top right corner (defaults to disabled)
+- Slightly optimized table loading & search performance (thanks @lwis)
+- Added that the currently active sidebar menu item is always in view
+- Reordered the sidebar menu items a little bit, grouped them by borders and made them a little smaller to waste less space
+- Changed/removed some animations (and replaced jQuery UI by [Animate.css](https://daneden.github.io/animate.css/)) to improve responsiveness
+- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field
+- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
+- For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu)
+- Fixed that the `update.sh` file had wrong line endings (DOS instead of Unix)
+- Internal change: Demo mode is now handled via the setting `MODE` instead of checking the existence of the file `data/demo.txt`
+- There is now a RSS feed for the changelog, subscribe to get notified about new releases: https://grocy.info/changelog/feed
+- New translations: (thanks all the translators)
+  - Hungarian (demo available at https://hu.demo.grocy.info)
+  - Portuguese (Brazil) (demo available at https://pt-br.demo.grocy.info)
+  - Slovak (demo available at https://sk.demo.grocy.info)

changelog/56_2.6.1_2020-03-06.md

@@ -0,0 +1,49 @@
+## !! Important notice
+If you run grocy in a subdirectory, you need to set a new `config.php` setting (`BASE_PATH`, see `config-dist.php`)
+
+### Stock fixes
+- Fixed purchase/consume/inventory problems when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false`
+- Fixed that products on the Location Content Sheet were not ordered by the product name
+
+### Shopping list improvements/fixes
+- Added an option to hide the month-calendar (in the shopping list settings / top right corner settings menu) (defaults to disabled, so please enable this option if you still want to have the month-calendar on the shopping list)
+- Optimized the new compact view (there was a little too much white space at the sides of the page)
+- Added an option to not switch to the new compact view on mobile devices automatically (in the shopping list settings / top right corner settings menu) (defaults to `false`, so no changed behavior when not configured) (thanks @Forceu)
+- Fixed that the "Shopping list to stock workflow" did not work when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` was set to `false`
+
+### Recipe improvements/fixes
+- Optimized the ordering of the inputs on the recipe ingredient edit page (moved "Only check if a single unit is in stock" before the amount)
+- Variable ingredient amounts are now marked accordingly on the renedered recipe
+- After selecting a recipe on mobile devices, the page now automatically scrolls to the recipe card
+- Added the recipes base servings to be displayed on the recipe card and properly named the servings column in the recipes list/table (thanks @kriddles)
+- Added that recipe ingredients can now also be displayed grouped by the products product group (additionally to the ingredient group, new option in the recipes settings / top right corner settings menu) (defaults to `false`, so no changed behavior when not configured) (thanks @kriddles)
+- Fixed that when editing a recipe ingredient which had "Only check if a single unit is in stock" set, not any quantity unit could be picked and the amount stayed empty
+- Fixed that when reloading the "new recipe"-page (or when it gets auto-reloaded due to "Auto reload on external changes" is enabled), for each reload a new recipe was created
+- Fixed that the recipe "fullscreen card" was not correctly displayed
+- Fixed that nested recipes showed all ingredients of the nested recipes twice
+- Fixed that when displaying or consuming a recipe from the meal plan the serving amount was maybe wrong (was the one from the recipe instead the one from the meal plan entry) (thanks @kriddles)
+- Fixed that the stock fulfillment counts on the recipe card were maybe wrong if that recipe was also added to the meal plan (thanks @kriddles)
+- Fixed that the recipe page was reloaded when expanding a collapsed row on mobile (thanks @Mikhail5555)
+
+### Meal plan improvements
+- Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product
+- Added an edit button to all types of meal plan entries
+- When adding a recipe, the serving amount is now prefilled with the one of the selected recipe (thanks @kriddles)
+- Fixed that the meal plan not used the full height on mobile devices
+
+### Calendar fixes
+- Fixed to only include events when the corresponding feature flag is enabled (e. g. don't show expiring products when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is set to `false`) (thanks @kriddles)
+- Fixed that the calendar not used the full height on mobile devices
+
+### API improvements/fixes
+- The endpoint `/chores` now also includes the chore name (new field `chore_name`) (thanks @DarienFord)
+
+### General & other improvements/fixes
+- Big backend performance improvements (thanks @zebardy)
+- Added a button to enable the device flash light on the camera barcode scanner popup (thanks @radim-ek)
+- Optimized the top navbar height and overall spacing to waste less space
+- Replaced the scan-mode-switch-button by a native button because it's less disturbing
+- Fixed that the "contextual time ago" of date/time pickers was not displayed
+- New translations: (thanks all the translators)
+  - Czech (demo available at https://cs.demo.grocy.info)
+  - Portuguese (Portugal) (demo available at https://pt-pt.demo.grocy.info)

changelog/57_2.6.2_2020-04-03.md

@@ -0,0 +1 @@
+Security fix (see [#696](https://github.com/grocy/grocy/issues/696))

changelog/58_2.7.0_2020-04-16.md

@@ -0,0 +1,66 @@
+### New feature: Price history per store
+- Define stores under master data
+- New product option to set the default store
+- Track on purchase/inventory in which store you bought the product (gets prefilled by the last store you purchased the product, or the default store of the product if you never bought it)
+- => The price history chart on the product card shows a line per store
+- (Thanks @immae and @kriddles)
+
+### Stock improvements/fixes
+- When creating a new product, the "QU id stock" is now preset by the "QU id purchase" (because most of the time that's most probably the same) (thanks @Mik-)
+- Clarified the row-button colors and toolips on the stock entries page
+- Added a camera-barcode-scanning-button to the barcode(s) field on the product edit page to be able to also scan barcodes by the device camera there
+- Added a new option (stock settings / top right corner settings menu) to show an icon on the stock overview if the product is already on the shopping list (next to the amount) (defaults to enabled)
+- Fixed that the aggregated parent product amount (displayed on the stock overview page and on the product card) did not respect quantity unit conversions when the parent/sub products had different stock quantity units (the unit conversion needs to be globally defined, or as an override on the sub product)
+- Fixed the conversion factor hint to display also decimal places on the purchase page (only displayed when the product has a different purchase/stock quantity unit)
+- Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables"
+- Fixed that best before dates were displayed on the stock overview and stock entries page even with disabled `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING`
+- Fixed that when editing a stock entry and setting a decimal amount, the decimal part was ignored (only possible when the product option "Allow partial units in stock" is enabled)
+- Fixed that "Default best before days" and "Default best before days after opened" on the product edit page were always shown regardless of the feature flags `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` and `FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING`
+- Fixed that the form validation limits for the amount input and products with enabled tare weight handling were wrong
+- Fixed that the price was saved wrong for products with a different purchase/stock quantity unit when using "Total price" on purchase (resulted for example in wrong recipe costs)
+- Fixed that undoing "product-opened"-actions was not possible
+- Fixed/improved consuming from the stock overview page for products with enabled tare weight handling ("consume 1" button is now disabled for such products, "consume all" works again)
+
+### Shopping list improvements/fixes
+- It's now possible to collapse/expand the product group sections (by clicking on the grey group header)
+- Fixed that the "shopping list to stock workflow"-dialog was not visible in compact view
+- Fixed that when printing the shopping list, configured userfields were not included
+
+### Recipe fixes
+- Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient
+- Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel)
+
+### Chores fixes
+- Fixed that weekly chores, where the next execution should be in the same week, were scheduled always for the next week only
+
+### Calendar fixes
+- Fixed that the "Share/Integrate calendar (iCal)" button did not work (thanks @tsia)
+
+### API improvements/fixes
+- New endpoint `/user/settings` to get all user settings of the currently logged in user (key/value pairs)
+- New endpoint `/system/config` to get all config settings (`config.php`) (key/value pairs)
+- The endpoint `/stock/products/{productId}/locations` now also returns the current stock amount of the product in that loctation (new field/property `amount`) (thanks @Forceu)
+- The endpoints `/objects/{entity}` and `/objects/{entity}/{objectId}` now also include/return userfields of the object(s) (new field/property `userfields` per object, key/value pairs or `null`, when the object has no userfields)
+- Fixed that CORS was broken (there was no response to preflight OPTIONS requests)
+
+### General & other improvements/fixes
+- Optimized that sometimes the corresponding form was not validated when selecting a date from the datetimepicker
+- New `config.php` setting `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD` which activates the number pad for best-before-date fields on (supported) mobile browsers (useful because of [shorthands](https://github.com/grocy/grocy#input-shorthands-for-date-fields)) (defaults to `true`) (thanks @Mik-)
+- Enhancements for the camera barcode scanner
+  - Torch / light improvements (thanks @Mik-)
+    - The light button is only displayed when the device has a flash light
+    - New `config.php` setting `FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA` to always enable the flash light automatically
+  - It's now possible to change the camera when the device has more than one (dropdown in the camera scanning dialog, only visible if there is more than one camera available) (thanks @MichaelMadsen)
+  - Replaced [QuaggaJS](https://github.com/serratus/quaggaJS) (seems to be unmaintained) by [Quagga2](https://github.com/ericblade/quagga2)
+  - New user setting `quagga2_numofworkers` (`config.php`) to make the Quagga2 setting "numOfWorkers" adjustable (defaults to `4`)
+  - Various display/CSS improvements (thanks @Mik-)
+- Prerequisites (PHP extensions, critical files/folders) will now be checked and properly reported if there are problems (thanks @Forceu)
+- Improved the the overview pages on mobile devices (main column was hidden) (thanks @Mik-)
+- The general search field now searches accent insensitive
+- Fixed that all number inputs are always prefilled in the browser locale number format
+- Optimized the handling of settings provided by `data/settingoverrides` files (thanks @dacto)
+- Optimized the update script (`update.sh`) to create the backup tar archive before writing to it (was a problem on Btrfs file systems) (thanks @shane-kerr)
+- Fixed (again) that the `update.sh` file had wrong line endings (DOS instead of Unix)
+- New translations: (thanks all the translators)
+  - Japanese (demo available at https://ja.demo.grocy.info)
+  - Chinese (Taiwan) (demo available at https://zh-tw.demo.grocy.info)

composer.json

@@ -1,13 +1,16 @@
 {
 	"require": {
 		"php": ">=7.2",
-		"slim/slim": "^3.12.1",
-		"morris/lessql": "^0.4.1",
+		"slim/slim": "^4.0",
+		"slim/psr7": "^1.0",
+		"slim/http": "^1.0",
+		"php-di/php-di": "^6.0",
 		"rubellum/slim-blade-view": "^0.1.1",
-		"tuupola/cors-middleware": "^0.9.4",
-		"eluceo/ical": "^0.15.0",
-		"erusev/parsedown": "^1.7.3",
-		"gettext/gettext": "^4.6.2"
+		"morris/lessql": "^0.4.1",
+		"gettext/gettext": "^4.8",
+		"eluceo/ical": "^0.16.0",
+		"erusev/parsedown": "^1.7",
+		"gumlet/php-image-resize": "^1.9"
 	},
 	"autoload": {
 		"psr-4": {

config-dist.php

@@ -14,11 +14,13 @@
 # The settings defined here below
 
 
-# Either "production", "dev" or "prerelease"
+# Either "production", "dev", "demo" or "prerelease"
+# When not "production", authentication will be disabled and
+# demo data will be populated during database migrations
 Setting('MODE', 'production');
 
-# Either "en" or "de" or the filename (without extension) of
-# one of the other available localization files in the "/localization" directory
+# Either "en" or "de" or the directory name of
+# one of the other available localization folders in the "/localization" directory
 Setting('CULTURE', 'en');
 
 # This is used to define the first day of a week for calendar views in the frontend,
@@ -26,12 +28,22 @@ Setting('CULTURE', 'en');
 # Needs to be a number where Sunday = 0, Monday = 1 and so forth
 Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
 
+# If calendars should show week numbers
+Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
+
 # To keep it simple: grocy does not handle any currency conversions,
 # this here is used to format all money values,
-# so doesn't matter really matter, but should be the
+# so doesn't really matter, but should be the
 # ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
 Setting('CURRENCY', 'USD');
 
+# When running grocy in a subdirectory, this should be set to the relative path, otherwise empty
+# Example:
+#  Webserver root directory = /var/www
+#  grocy directory = /var/www/grocy
+#  => BASE_PATH = /grocy
+Setting('BASE_PATH', '');
+
 # The base url of your installation,
 # should be just "/" when running directly under the root of a (sub)domain
 # or for example "https://example.com/grocy" when using a subdirectory
@@ -42,15 +54,25 @@ Setting('BASE_URL', '/');
 # see /data/plugins/DemoBarcodeLookupPlugin.php for an example implementation
 Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
 
-# If, however, your webserver does not support URL rewriting,
-# set this to true
+# If, however, your webserver does not support URL rewriting, set this to true
 Setting('DISABLE_URL_REWRITING', false);
 
+# Specify an custom homepage if desired - by default the homepage will be set to the stock overview,
+# this needs to be one of the following values:
+# stock, shoppinglist, recipes, chores, tasks, batteries, equipment, calendar, mealplan
+Setting('ENTRY_PAGE', 'stock');
+
 # Set this to true if you want to disable authentication / the login screen,
 # places where user context is needed will then use the default (first existing) user
 Setting('DISABLE_AUTH', false);
 
+# Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
+Setting('DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false);
 
+# Set this if you want to have a different start day for the weekly meal plan view,
+# leave empty to use CALENDAR_FIRST_DAY_OF_WEEK (see above)
+# Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', '');
 
 
 # Default user settings
@@ -65,6 +87,10 @@ DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
 DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
 DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
 
+# Keep screen on settings
+DefaultUserSetting('keep_screen_on', false); // Keep the screen always on
+DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // Keep the screen on when a "fullscreen-card" is displayed
+
 # Stock settings
 DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
 DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
@@ -72,6 +98,17 @@ DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for
 DefaultUserSetting('stock_expring_soon_days', 5);
 DefaultUserSetting('stock_default_purchase_amount', 0);
 DefaultUserSetting('stock_default_consume_amount', 1);
+DefaultUserSetting('scan_mode_consume_enabled', false);
+DefaultUserSetting('scan_mode_purchase_enabled', false);
+DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true);
+
+# Shopping list settings
+DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false); // Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set
+DefaultUserSetting('shopping_list_show_calendar', false);
+DefaultUserSetting('shopping_list_disable_auto_compact_view_on_mobile', false);
+
+# Recipe settings
+DefaultUserSetting('recipe_ingredients_group_by_product_group', false); // Group recipe ingredients by their product group
 
 # Chores settings
 DefaultUserSetting('chores_due_soon_days', 5);
@@ -89,12 +126,8 @@ DefaultUserSetting('auto_reload_on_db_change', true);
 # Show a clock in the header next to the logo or not
 DefaultUserSetting('show_clock_in_header', false);
 
-# Shopping list to stock workflow:
-# Automatically do the booking using the last price and the amount
-# of the shopping list item, if the product has "Default best before days" set
-DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false);
-
-
+# Component configuration
+DefaultUserSetting('quagga2_numofworkers', 4);
 
 
 # Feature flags
@@ -110,3 +143,19 @@ Setting('FEATURE_FLAG_TASKS', true);
 Setting('FEATURE_FLAG_BATTERIES', true);
 Setting('FEATURE_FLAG_EQUIPMENT', true);
 Setting('FEATURE_FLAG_CALENDAR', true);
+
+
+# Sub feature flags
+Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true);
+Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in best-before-date fields on (supported) mobile browsers
+Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
+Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
+
+
+# Feature settings
+Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to false, opened products will not be considered for minimum stock amounts
+Setting('FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA', true); // Enables the torch automaticaly in every camera barcode scanner.

controllers/BaseApiController.php

@@ -5,25 +5,34 @@ namespace Grocy\Controllers;
 class BaseApiController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->OpenApiSpec = json_decode(file_get_contents(__DIR__ . '/../grocy.openapi.json'));
 	}
 
-	protected $OpenApiSpec;
+	protected $OpenApiSpec = null;
 
-	protected function ApiResponse($data)
+	protected function getOpenApispec()
 	{
-		return json_encode($data);
+		if($this->OpenApiSpec == null)
+		{
+			$this->OpenApiSpec = json_decode(file_get_contents(__DIR__ . '/../grocy.openapi.json'));
+		}
+		return $this->OpenApiSpec;
 	}
 
-	protected function EmptyApiResponse($response, $status = 204)
+	protected function ApiResponse(\Psr\Http\Message\ResponseInterface $response, $data)
+	{
+		$response->getBody()->write(json_encode($data));
+		return $response;
+	}
+
+	protected function EmptyApiResponse(\Psr\Http\Message\ResponseInterface $response, $status = 204)
 	{
 		return $response->withStatus($status);
 	}
 
-	protected function GenericErrorResponse($response, $errorMessage, $status = 400)
+	protected function GenericErrorResponse(\Psr\Http\Message\ResponseInterface $response, $errorMessage, $status = 400)
 	{
 		return $response->withStatus($status)->withJson(array(
 			'error_message' => $errorMessage

controllers/BaseController.php

@@ -5,54 +5,56 @@ namespace Grocy\Controllers;
 use \Grocy\Services\DatabaseService;
 use \Grocy\Services\ApplicationService;
 use \Grocy\Services\LocalizationService;
+use \Grocy\Services\StockService;
 use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
+use \Grocy\Services\BatteriesService;
+use \Grocy\Services\CalendarService;
+use \Grocy\Services\SessionService;
+use \Grocy\Services\RecipesService;
+use \Grocy\Services\TasksService;
+use \Grocy\Services\FilesService;
+use \Grocy\Services\ChoresService;
+use \Grocy\Services\ApiKeyService;
 
 class BaseController
 {
-	public function __construct(\Slim\Container $container) {
-		$databaseService = new DatabaseService();
-		$this->Database = $databaseService->GetDbConnection();
-		
-		$localizationService = new LocalizationService(GROCY_CULTURE);
-		$this->LocalizationService = $localizationService;
+	public function __construct(\DI\Container $container) {
 
-		if (GROCY_MODE === 'prerelease')
-		{
-			$commitHash = trim(exec('git log --pretty="%h" -n1 HEAD'));
-			$commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD'));
-			
-			$container->view->set('version', "pre-release-$commitHash");
-			$container->view->set('releaseDate', \substr($commitDate, 0, 19));
-		}
-		else
-		{
-			$applicationService = new ApplicationService();
-			$versionInfo = $applicationService->GetInstalledVersion();
-			$container->view->set('version', $versionInfo->Version);
-			$container->view->set('releaseDate', $versionInfo->ReleaseDate);
-		}
+		$this->AppContainer = $container;
+		$this->View = $container->get('view');
+	}
 
-		$container->view->set('__t', function(string $text, ...$placeholderValues) use($localizationService)
+	protected function render($response, $page, $data = [])
+	{
+		$container = $this->AppContainer;
+
+		$versionInfo = $this->getApplicationService()->GetInstalledVersion();
+		$this->View->set('version', $versionInfo->Version);
+		$this->View->set('releaseDate', $versionInfo->ReleaseDate);
+
+        $localizationService = $this->getLocalizationService();
+		$this->View->set('__t', function(string $text, ...$placeholderValues) use($localizationService)
 		{
 			return $localizationService->__t($text, $placeholderValues);
 		});
-		$container->view->set('__n', function($number, $singularForm, $pluralForm) use($localizationService)
+		$this->View->set('__n', function($number, $singularForm, $pluralForm) use($localizationService)
 		{
 			return $localizationService->__n($number, $singularForm, $pluralForm);
 		});
-		$container->view->set('GettextPo', $localizationService->GetPoAsJsonString());
+		$this->View->set('GettextPo', $localizationService->GetPoAsJsonString());
 
-		$container->view->set('U', function($relativePath, $isResource = false) use($container)
+		$this->View->set('U', function($relativePath, $isResource = false) use($container)
 		{
-			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
+			return $container->get('UrlManager')->ConstructUrl($relativePath, $isResource);
 		});
 
 		$embedded = false;
-		if (isset($container->request->getQueryParams()['embedded']))
+		if (isset($_GET['embedded']))
 		{
 			$embedded = true;
 		}
-		$container->view->set('embedded', $embedded);
+		$this->View->set('embedded', $embedded);
 
 		$constants = get_defined_constants();
 		foreach ($constants as $constant => $value)
@@ -62,18 +64,24 @@ class BaseController
 				unset($constants[$constant]);
 			}
 		}
-		$container->view->set('featureFlags', $constants);
+		$this->View->set('featureFlags', $constants);
 
+		return $this->View->render($response, $page, $data);
+	}
+
+	protected function renderPage($response, $page, $data = [])
+	{
+		$this->View->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name'));
 		try
 		{
-			$usersService = new UsersService();
+			$usersService = $this->getUsersService();
 			if (defined('GROCY_USER_ID'))
 			{
-				$container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
+				$this->View->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
 			}
 			else
 			{
-				$container->view->set('userSettings', null);
+				$this->View->set('userSettings', null);
 			}
 		}
 		catch (\Exception $ex)
@@ -81,10 +89,83 @@ class BaseController
 			// Happens when database is not initialised or migrated...
 		}
 
-		$this->AppContainer = $container;
+		return $this->render($response, $page, $data);
 	}
 
+    protected function getDatabaseService()
+	{
+		return DatabaseService::getInstance();
+	}
+
+    protected function getDatabase()
+	{
+		return $this->getDatabaseService()->GetDbConnection();
+	}
+
+	protected function getLocalizationService()
+	{
+		return LocalizationService::getInstance(GROCY_CULTURE);
+	}
+
+	protected function getApplicationservice()
+	{
+		return ApplicationService::getInstance();
+	}
+
+	protected function getBatteriesService()
+	{
+		return BatteriesService::getInstance();
+	}
+
+	protected function getCalendarService()
+	{
+		return CalendarService::getInstance();
+	}
+
+    protected function getSessionService()
+	{
+		return SessionService::getInstance();
+	}
+
+	protected function getRecipesService()
+	{
+		return RecipesService::getInstance();
+	}
+
+	protected function getStockService()
+	{
+		return StockService::getInstance();
+	}
+
+    protected function getTasksService()
+	{
+		return TasksService::getInstance();
+	}
+
+    protected function getUsersService()
+	{
+		return UsersService::getInstance();
+	}
+
+	protected function getUserfieldsService()
+	{
+		return UserfieldsService::getInstance();
+	}
+
+	protected function getApiKeyService()
+	{
+		return ApiKeyService::getInstance();
+	}
+
+	protected function getChoresService()
+	{
+		return ChoresService::getInstance();
+	}
+
+	protected function getFilesService()
+	{
+		return FilesService::getInstance();
+	}
+	
 	protected $AppContainer;
-	protected $Database;
-	protected $LocalizationService;
 }

controllers/BatteriesApiController.php

@@ -2,19 +2,14 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\BatteriesService;
-
 class BatteriesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->BatteriesService = new BatteriesService();
 	}
 
-	protected $BatteriesService;
-
-	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -26,8 +21,8 @@ class BatteriesApiController extends BaseApiController
 				$trackedTime = $requestBody['tracked_time'];
 			}
 
-			$chargeCycleId = $this->BatteriesService->TrackChargeCycle($args['batteryId'], $trackedTime);
-			return $this->ApiResponse($this->Database->battery_charge_cycles($chargeCycleId));
+			$chargeCycleId = $this->getBatteriesService()->TrackChargeCycle($args['batteryId'], $trackedTime);
+			return $this->ApiResponse($response, $this->getDatabase()->battery_charge_cycles($chargeCycleId));
 		}
 		catch (\Exception $ex)
 		{
@@ -35,11 +30,11 @@ class BatteriesApiController extends BaseApiController
 		}
 	}
 
-	public function BatteryDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteryDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->BatteriesService->GetBatteryDetails($args['batteryId']));
+			return $this->ApiResponse($response, $this->getBatteriesService()->GetBatteryDetails($args['batteryId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -47,16 +42,16 @@ class BatteriesApiController extends BaseApiController
 		}
 	}
 
-	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->BatteriesService->GetCurrent());
+		return $this->ApiResponse($response, $this->getBatteriesService()->GetCurrent());
 	}
 
-	public function UndoChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->BatteriesService->UndoChargeCycle($args['chargeCycleId']));
+			$this->ApiResponse($response, $this->getBatteriesService()->UndoChargeCycle($args['chargeCycleId']));
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)

controllers/BatteriesController.php

@@ -2,81 +2,72 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\BatteriesService;
-use \Grocy\Services\UsersService;
-use \Grocy\Services\UserfieldsService;
-
 class BatteriesController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->BatteriesService = new BatteriesService();
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $BatteriesService;
-	protected $UserfieldsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$usersService = new UsersService();
+		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
 
-		return $this->AppContainer->view->render($response, 'batteriesoverview', [
-			'batteries' => $this->Database->batteries()->orderBy('name'),
-			'current' => $this->BatteriesService->GetCurrent(),
+		return $this->renderPage($response, 'batteriesoverview', [
+			'batteries' => $this->getDatabase()->batteries()->orderBy('name'),
+			'current' => $this->getBatteriesService()->GetCurrent(),
 			'nextXDays' => $nextXDays,
-			'userfields' => $this->UserfieldsService->GetFields('batteries'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('batteries')
+			'userfields' => $this->getUserfieldsService()->GetFields('batteries'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('batteries')
 		]);
 	}
 
-	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'batterytracking', [
-			'batteries' =>  $this->Database->batteries()->orderBy('name')
+		return $this->renderPage($response, 'batterytracking', [
+			'batteries' =>  $this->getDatabase()->batteries()->orderBy('name')
 		]);
 	}
 
-	public function BatteriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'batteries', [
-			'batteries' => $this->Database->batteries()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('batteries'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('batteries')
+		return $this->renderPage($response, 'batteries', [
+			'batteries' => $this->getDatabase()->batteries()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('batteries'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('batteries')
 		]);
 	}
 
-	public function BatteryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['batteryId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'batteryform', [
+			return $this->renderPage($response, 'batteryform', [
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('batteries')
+				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'batteryform', [
-				'battery' =>  $this->Database->batteries($args['batteryId']),
+			return $this->renderPage($response, 'batteryform', [
+				'battery' =>  $this->getDatabase()->batteries($args['batteryId']),
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('batteries')
+				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
 			]);
 		}
 	}
 
-	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'batteriesjournal', [
-			'chargeCycles' => $this->Database->battery_charge_cycles()->orderBy('tracked_time', 'DESC'),
-			'batteries' => $this->Database->batteries()->orderBy('name')
+		return $this->renderPage($response, 'batteriesjournal', [
+			'chargeCycles' => $this->getDatabase()->battery_charge_cycles()->orderBy('tracked_time', 'DESC'),
+			'batteries' => $this->getDatabase()->batteries()->orderBy('name')
 		]);
 	}
 
-	public function BatteriesSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteriesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'batteriessettings');
+		return $this->renderPage($response, 'batteriessettings');
 	}
 }

controllers/CalendarApiController.php

@@ -2,37 +2,38 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\CalendarService;
-use \Grocy\Services\ApiKeyService;
-
 class CalendarApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->CalendarService = new CalendarService();
-		$this->ApiKeyService = new ApiKeyService();
 	}
 
-	protected $CalendarService;
-	protected $ApiKeyService;
-
-	public function Ical(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Ical(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
 			$vCalendar = new \Eluceo\iCal\Component\Calendar('grocy');
 
-			$events = $this->CalendarService->GetEvents();
+			$events = $this->getCalendarService()->GetEvents();
 			foreach($events as $event)
 			{
+				$date = new \DateTime($event['start']);
+				$date->setTimezone(date_default_timezone_get());
+
+				if ($event['date_format'] === 'date')
+				{
+					$date->setTime(23, 59, 59);
+				}
+
 				$vEvent = new \Eluceo\iCal\Component\Event();
-				$vEvent->setDtStart(new \DateTime($event['start']))
-					->setDtEnd(new \DateTime($event['start']))
+				$vEvent->setDtStart($date)
+					->setDtEnd($date)
 					->setSummary($event['title'])
+					->setDescription($event['description'])
 					->setNoTime($event['date_format'] === 'date')
-					->setUseUtc(false);
-				
+					->setUseTimezone(true);
+
 				$vCalendar->addComponent($vEvent);
 			}
 
@@ -46,12 +47,12 @@ class CalendarApiController extends BaseApiController
 		}
 	}
 
-	public function IcalSharingLink(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function IcalSharingLink(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse(array(
-				'url' => $this->AppContainer->UrlManager->ConstructUrl('/api/calendar/ical?secret=' . $this->ApiKeyService->GetOrCreateApiKey(ApiKeyService::API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL))
+			return $this->ApiResponse($response, array(
+				'url' => $this->AppContainer->get('UrlManager')->ConstructUrl('/api/calendar/ical?secret=' . $this->getApiKeyService()->GetOrCreateApiKey(\Grocy\Services\ApiKeyService::API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL))
 			));
 		}
 		catch (\Exception $ex)

controllers/CalendarController.php

@@ -2,22 +2,17 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\CalendarService;
-
 class CalendarController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->CalendarService = new CalendarService();
 	}
 
-	protected $CalendarService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'calendar', [
-			'fullcalendarEventSources' => $this->CalendarService->GetEvents()
+		return $this->renderPage($response, 'calendar', [
+			'fullcalendarEventSources' => $this->getCalendarService()->GetEvents()
 		]);
 	}
 }

controllers/ChoresApiController.php

@@ -2,19 +2,14 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ChoresService;
-
 class ChoresApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ChoresService = new ChoresService();
 	}
 
-	protected $ChoresService;
-
-	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -32,8 +27,8 @@ class ChoresApiController extends BaseApiController
 				$doneBy = $requestBody['done_by'];
 			}
 
-			$choreExecutionId = $this->ChoresService->TrackChore($args['choreId'], $trackedTime, $doneBy);
-			return $this->ApiResponse($this->Database->chores_log($choreExecutionId));
+			$choreExecutionId = $this->getChoresService()->TrackChore($args['choreId'], $trackedTime, $doneBy);
+			return $this->ApiResponse($response, $this->getDatabase()->chores_log($choreExecutionId));
 		}
 		catch (\Exception $ex)
 		{
@@ -41,11 +36,11 @@ class ChoresApiController extends BaseApiController
 		}
 	}
 
-	public function ChoreDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoreDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->ChoresService->GetChoreDetails($args['choreId']));
+			return $this->ApiResponse($response, $this->getChoresService()->GetChoreDetails($args['choreId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -53,16 +48,49 @@ class ChoresApiController extends BaseApiController
 		}
 	}
 
-	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->ChoresService->GetCurrent());
+		return $this->ApiResponse($response, $this->getChoresService()->GetCurrent());
 	}
 
-	public function UndoChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->ChoresService->UndoChoreExecution($args['executionId']));
+			$this->ApiResponse($response, $this->getChoresService()->UndoChoreExecution($args['executionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function CalculateNextExecutionAssignments(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$choreId = null;
+			if (array_key_exists('chore_id', $requestBody) && !empty($requestBody['chore_id']) && is_numeric($requestBody['chore_id']))
+			{
+				$choreId = intval($requestBody['chore_id']);
+			}
+
+			if ($choreId === null)
+			{
+				$chores = $this->getDatabase()->chores();
+				foreach ($chores as $chore)
+				{
+					$this->getChoresService()->CalculateNextExecutionAssignment($chore->id);
+				}
+			}
+			else
+			{
+				$this->getChoresService()->CalculateNextExecutionAssignment($choreId);
+			}
+
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)

controllers/ChoresController.php

@@ -2,85 +2,86 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ChoresService;
-use \Grocy\Services\UsersService;
-use \Grocy\Services\UserfieldsService;
-
 class ChoresController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ChoresService = new ChoresService();
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $ChoresService;
-	protected $UserfieldsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$usersService = new UsersService();
+		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
 
-		return $this->AppContainer->view->render($response, 'choresoverview', [
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'currentChores' => $this->ChoresService->GetCurrent(),
+		return $this->renderPage($response, 'choresoverview', [
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'currentChores' => $this->getChoresService()->GetCurrent(),
 			'nextXDays' => $nextXDays,
-			'userfields' => $this->UserfieldsService->GetFields('chores'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('chores')
+			'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores'),
+			'users' => $usersService->GetUsersAsDto()
 		]);
 	}
 
-	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'choretracking', [
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'users' => $this->Database->users()->orderBy('username')
+		return $this->renderPage($response, 'choretracking', [
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
 
-	public function ChoresList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoresList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'chores', [
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('chores'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('chores')
+		return $this->renderPage($response, 'chores', [
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores')
 		]);
 	}
 
-	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'choresjournal', [
-			'choresLog' => $this->Database->chores_log()->orderBy('tracked_time', 'DESC'),
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'users' => $this->Database->users()->orderBy('username')
+		return $this->renderPage($response, 'choresjournal', [
+			'choresLog' => $this->getDatabase()->chores_log()->orderBy('tracked_time', 'DESC'),
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
 
-	public function ChoreEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoreEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
+		$usersService = $this->getUsersService();
+		$users = $usersService->GetUsersAsDto();
+
 		if ($args['choreId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'choreform', [
-				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
+			return $this->renderPage($response, 'choreform', [
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('chores')
+				'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+				'assignmentTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_ASSIGNMENT_TYPE_'),
+				'users' => $users,
+				'products' => $this->getDatabase()->products()->orderBy('name')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'choreform', [
-				'chore' =>  $this->Database->chores($args['choreId']),
-				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
+			return $this->renderPage($response, 'choreform', [
+				'chore' =>  $this->getDatabase()->chores($args['choreId']),
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('chores')
+				'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+				'assignmentTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_ASSIGNMENT_TYPE_'),
+				'users' => $users,
+				'products' => $this->getDatabase()->products()->orderBy('name')
 			]);
 		}
 	}
 
-	public function ChoresSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoresSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'choressettings');
+		return $this->renderPage($response, 'choressettings');
 	}
 }

controllers/EquipmentController.php

@@ -2,42 +2,39 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\UserfieldsService;
-
 class EquipmentController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $UserfieldsService;
 
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'equipment', [
-			'equipment' => $this->Database->equipment()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('equipment'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('equipment')
+		return $this->renderPage($response, 'equipment', [
+			'equipment' => $this->getDatabase()->equipment()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('equipment'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('equipment')
 		]);
 	}
 
-	public function EditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['equipmentId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'equipmentform', [
+			return $this->renderPage($response, 'equipmentform', [
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('equipment')
+				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'equipmentform', [
-				'equipment' =>  $this->Database->equipment($args['equipmentId']),
+			return $this->renderPage($response, 'equipmentform', [
+				'equipment' =>  $this->getDatabase()->equipment($args['equipmentId']),
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('equipment')
+				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
 			]);
 		}
 	}

controllers/FilesApiController.php

@@ -6,15 +6,12 @@ use \Grocy\Services\FilesService;
 
 class FilesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->FilesService = new FilesService();
 	}
 
-	protected $FilesService;
-
-	public function UploadFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UploadFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -28,7 +25,7 @@ class FilesApiController extends BaseApiController
 			}
 
 			$data = $request->getBody()->getContents();
-			file_put_contents($this->FilesService->GetFilePath($args['group'], $fileName), $data);
+			file_put_contents($this->getFilesService()->GetFilePath($args['group'], $fileName), $data);
 
 			return $this->EmptyApiResponse($response);
 		}
@@ -38,7 +35,7 @@ class FilesApiController extends BaseApiController
 		}
 	}
 
-	public function ServeFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ServeFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -51,11 +48,37 @@ class FilesApiController extends BaseApiController
 				throw new \Exception('Invalid filename');
 			}
 
-			$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
+			$forceServeAs = null;
+			if (isset($request->getQueryParams()['force_serve_as']) && !empty($request->getQueryParams()['force_serve_as']))
+			{
+				$forceServeAs = $request->getQueryParams()['force_serve_as'];
+			}
+
+			if ($forceServeAs == FilesService::FILE_SERVE_TYPE_PICTURE)
+			{
+				$bestFitHeight = null;
+				if (isset($request->getQueryParams()['best_fit_height']) && !empty($request->getQueryParams()['best_fit_height']) && is_numeric($request->getQueryParams()['best_fit_height']))
+				{
+					$bestFitHeight = $request->getQueryParams()['best_fit_height'];
+				}
+
+				$bestFitWidth = null;
+				if (isset($request->getQueryParams()['best_fit_width']) && !empty($request->getQueryParams()['best_fit_width']) && is_numeric($request->getQueryParams()['best_fit_width']))
+				{
+					$bestFitWidth = $request->getQueryParams()['best_fit_width'];
+				}
+
+				$filePath = $this->getFilesService()->DownscaleImage($args['group'], $fileName, $bestFitHeight, $bestFitWidth);
+			}
+			else
+			{
+				$filePath = $this->getFilesService()->GetFilePath($args['group'], $fileName);
+			}
 
 			if (file_exists($filePath))
 			{
 				$response->write(file_get_contents($filePath));
+				$response = $response->withHeader('Cache-Control', 'max-age=2592000');
 				$response = $response->withHeader('Content-Type', mime_content_type($filePath));
 				return $response->withHeader('Content-Disposition', 'inline; filename="' . $fileName . '"');
 			}
@@ -70,7 +93,7 @@ class FilesApiController extends BaseApiController
 		}
 	}
 
-	public function DeleteFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DeleteFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -83,7 +106,7 @@ class FilesApiController extends BaseApiController
 				throw new \Exception('Invalid filename');
 			}
 
-			$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
+			$filePath = $this->getFilesService()->GetFilePath($args['group'], $fileName);
 			if (file_exists($filePath))
 			{
 				unlink($filePath);

controllers/GenericEntityApiController.php

@@ -2,23 +2,36 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\UserfieldsService;
-
 class GenericEntityApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $UserfieldsService;
-
-	public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
+		$objects = $this->getDatabase()->{$args['entity']}();
+		$allUserfields = $this->getUserfieldsService()->GetAllValues($args['entity']);
+
+		foreach ($objects as $object)
+		{
+			$userfields = FindAllObjectsInArrayByPropertyValue($allUserfields, 'object_id', $object->id);
+			$userfieldKeyValuePairs = null;
+			if (count($userfields) > 0)
+			{
+				foreach ($userfields as $userfield)
+				{
+					$userfieldKeyValuePairs[$userfield->name] = $userfield->value;
+				}
+			}
+
+			$object->userfields = $userfieldKeyValuePairs;
+		}
+
 		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
-			return $this->ApiResponse($this->Database->{$args['entity']}());
+			return $this->ApiResponse($response, $objects);
 		}
 		else
 		{
@@ -26,11 +39,20 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function GetObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
-			return $this->ApiResponse($this->Database->{$args['entity']}($args['objectId']));
+			$userfields = $this->getUserfieldsService()->GetValues($args['entity'], $args['objectId']);
+			if (count($userfields) === 0)
+			{
+				$userfields = null;
+			}
+
+			$object = $this->getDatabase()->{$args['entity']}($args['objectId']);
+			$object['userfields'] = $userfields;
+
+			return $this->ApiResponse($response, $object);
 		}
 		else
 		{
@@ -38,7 +60,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function AddObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
@@ -51,11 +73,11 @@ class GenericEntityApiController extends BaseApiController
 					throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
 				}
 
-				$newRow = $this->Database->{$args['entity']}()->createRow($requestBody);
+				$newRow = $this->getDatabase()->{$args['entity']}()->createRow($requestBody);
 				$newRow->save();
 				$success = $newRow->isClean();
-				return $this->ApiResponse(array(
-					'created_object_id' => $this->Database->lastInsertId()
+				return $this->ApiResponse($response, array(
+					'created_object_id' => $this->getDatabase()->lastInsertId()
 				));
 			}
 			catch (\Exception $ex)
@@ -69,7 +91,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function EditObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
@@ -82,7 +104,7 @@ class GenericEntityApiController extends BaseApiController
 					throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
 				}
 
-				$row = $this->Database->{$args['entity']}($args['objectId']);
+				$row = $this->getDatabase()->{$args['entity']}($args['objectId']);
 				$row->update($requestBody);
 				$success = $row->isClean();
 				return $this->EmptyApiResponse($response);
@@ -98,11 +120,11 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function DeleteObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
-			$row = $this->Database->{$args['entity']}($args['objectId']);
+			$row = $this->getDatabase()->{$args['entity']}($args['objectId']);
 			$row->delete();
 			$success = $row->isClean();
 			return $this->EmptyApiResponse($response);
@@ -113,11 +135,30 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function GetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function SearchObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
+		{
+			try
+			{
+				return $this->ApiResponse($response, $this->getDatabase()->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
+			}
+			catch (\PDOException $ex)
+			{
+				return $this->GenericErrorResponse($response, 'The given entity has no field "name"');
+			}
+		}
+		else
+		{
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
+		}
+	}
+
+	public function GetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->UserfieldsService->GetValues($args['entity'], $args['objectId']));
+			return $this->ApiResponse($response, $this->getUserfieldsService()->GetValues($args['entity'], $args['objectId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -125,7 +166,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function SetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -136,7 +177,7 @@ class GenericEntityApiController extends BaseApiController
 				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
 			}
 
-			$this->UserfieldsService->SetValues($args['entity'], $args['objectId'], $requestBody);
+			$this->getUserfieldsService()->SetValues($args['entity'], $args['objectId'], $requestBody);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -147,11 +188,11 @@ class GenericEntityApiController extends BaseApiController
 
 	private function IsValidEntity($entity)
 	{
-		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntity->enum);
+		return in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntity->enum);
 	}
 
 	private function IsEntityWithPreventedListing($entity)
 	{
-		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntitiesPreventListing->enum);
+		return !in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntityButNoListing->enum);
 	}
 }

controllers/GenericEntityController.php

@@ -2,43 +2,97 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\UserfieldsService;
-
 class GenericEntityController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $UserfieldsService;
-
-	public function UserfieldsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserfieldsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'userfields', [
-			'userfields' => $this->UserfieldsService->GetAllFields(),
-			'entities' => $this->UserfieldsService->GetEntities()
+		return $this->renderPage($response, 'userfields', [
+			'userfields' => $this->getUserfieldsService()->GetAllFields(),
+			'entities' => $this->getUserfieldsService()->GetEntities()
 		]);
 	}
 
-	public function UserfieldEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserentitiesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'userentities', [
+			'userentities' => $this->getDatabase()->userentities()->orderBy('name')
+		]);
+	}
+
+	public function UserobjectsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch();
+
+		return $this->renderPage($response, 'userobjects', [
+			'userentity' => $userentity,
+			'userobjects' => $this->getDatabase()->userobjects()->where('userentity_id = :1', $userentity->id),
+			'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName']),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('userentity-' . $args['userentityName'])
+		]);
+	}
+
+	public function UserfieldEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['userfieldId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'userfieldform', [
+			return $this->renderPage($response, 'userfieldform', [
 				'mode' => 'create',
-				'userfieldTypes' => $this->UserfieldsService->GetFieldTypes(),
-				'entities' => $this->UserfieldsService->GetEntities()
+				'userfieldTypes' => $this->getUserfieldsService()->GetFieldTypes(),
+				'entities' => $this->getUserfieldsService()->GetEntities()
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'userfieldform', [
+			return $this->renderPage($response, 'userfieldform', [
 				'mode' => 'edit',
-				'userfield' =>  $this->UserfieldsService->GetField($args['userfieldId']),
-				'userfieldTypes' => $this->UserfieldsService->GetFieldTypes(),
-				'entities' => $this->UserfieldsService->GetEntities()
+				'userfield' =>  $this->getUserfieldsService()->GetField($args['userfieldId']),
+				'userfieldTypes' => $this->getUserfieldsService()->GetFieldTypes(),
+				'entities' => $this->getUserfieldsService()->GetEntities()
+			]);
+		}
+	}
+
+	public function UserentityEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($args['userentityId'] == 'new')
+		{
+			return $this->renderPage($response, 'userentityform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'userentityform', [
+				'mode' => 'edit',
+				'userentity' =>  $this->getDatabase()->userentities($args['userentityId'])
+			]);
+		}
+	}
+
+	public function UserobjectEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch();
+
+		if ($args['userobjectId'] == 'new')
+		{
+			return $this->renderPage($response, 'userobjectform', [
+				'userentity' => $userentity,
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName'])
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'userobjectform', [
+				'userentity' => $userentity,
+				'mode' => 'edit',
+				'userobject' =>  $this->getDatabase()->userobjects($args['userobjectId']),
+				'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName'])
 			]);
 		}
 	}

controllers/LoginController.php

@@ -2,34 +2,27 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\SessionService;
-use \Grocy\Services\DatabaseMigrationService;
-use \Grocy\Services\DemoDataGeneratorService;
-
 class LoginController extends BaseController
 {
-	public function __construct(\Slim\Container $container, string $sessionCookieName)
+	public function __construct(\DI\Container $container, string $sessionCookieName)
 	{
 		parent::__construct($container);
-		$this->SessionService = new SessionService();
 		$this->SessionCookieName = $sessionCookieName;
 	}
-
-	protected $SessionService;
 	protected $SessionCookieName;
 
-	public function ProcessLogin(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProcessLogin(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$postParams = $request->getParsedBody();
 		if (isset($postParams['username']) && isset($postParams['password']))
 		{
-			$user = $this->Database->users()->where('username', $postParams['username'])->fetch();
+			$user = $this->getDatabase()->users()->where('username', $postParams['username'])->fetch();
 			$inputPassword = $postParams['password'];
 			$stayLoggedInPermanently = $postParams['stay_logged_in'] == 'on';
 
 			if ($user !== null && password_verify($inputPassword, $user->password))
 			{
-				$sessionKey = $this->SessionService->CreateSession($user->id, $stayLoggedInPermanently);
+				$sessionKey = $this->getSessionService()->CreateSession($user->id, $stayLoggedInPermanently);
 				setcookie($this->SessionCookieName, $sessionKey, PHP_INT_SIZE == 4 ? PHP_INT_MAX : PHP_INT_MAX>>32); // Cookie expires never, but session validity is up to SessionService
 
 				if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
@@ -39,28 +32,28 @@ class LoginController extends BaseController
 					));
 				}
 
-				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
+				return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/'));
 			}
 			else
 			{
-				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login?invalid=true'));
+				return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/login?invalid=true'));
 			}
 		}
 		else
 		{
-			return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login?invalid=true'));
+			return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/login?invalid=true'));
 		}
 	}
 
-	public function LoginPage(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LoginPage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'login');
+		return $this->renderPage($response, 'login');
 	}
 
-	public function Logout(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Logout(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$this->SessionService->RemoveSession($_COOKIE[$this->SessionCookieName]);
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
+		$this->getSessionService()->RemoveSession($_COOKIE[$this->SessionCookieName]);
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/'));
 	}
 
 	public function GetSessionCookieName()

controllers/OpenApiController.php

@@ -2,48 +2,42 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ApplicationService;
-use \Grocy\Services\ApiKeyService;
-
 class OpenApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ApiKeyService = new ApiKeyService();
 	}
 
-	protected $ApiKeyService;
-
-	public function DocumentationUi(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DocumentationUi(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'openapiui');
+		return $this->render($response, 'openapiui');
 	}
 
-	public function DocumentationSpec(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DocumentationSpec(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$applicationService = new ApplicationService();
+		$applicationService = $this->getApplicationService();
 
 		$versionInfo = $applicationService->GetInstalledVersion();
-		$this->OpenApiSpec->info->version = $versionInfo->Version;
-		$this->OpenApiSpec->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->UrlManager->ConstructUrl('/manageapikeys'), $this->OpenApiSpec->info->description);
-		$this->OpenApiSpec->servers[0]->url = $this->AppContainer->UrlManager->ConstructUrl('/api');
+		$this->getOpenApiSpec()->info->version = $versionInfo->Version;
+		$this->getOpenApiSpec()->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->get('UrlManager')->ConstructUrl('/manageapikeys'), $this->getOpenApiSpec()->info->description);
+		$this->getOpenApiSpec()->servers[0]->url = $this->AppContainer->get('UrlManager')->ConstructUrl('/api');
 
-		return $this->ApiResponse($this->OpenApiSpec);
+		return $this->ApiResponse($response, $this->getOpenApiSpec());
 	}
 
-	public function ApiKeysList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ApiKeysList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'manageapikeys', [
-			'apiKeys' => $this->Database->api_keys(),
-			'users' => $this->Database->users()
+		return $this->renderPage($response, 'manageapikeys', [
+			'apiKeys' => $this->getDatabase()->api_keys(),
+			'users' => $this->getDatabase()->users()
 		]);
 	}
 
-	public function CreateNewApiKey(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CreateNewApiKey(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$newApiKey = $this->ApiKeyService->CreateApiKey();
-		$newApiKeyId = $this->ApiKeyService->GetApiKeyId($newApiKey);
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
+		$newApiKey = $this->getApiKeyService()->CreateApiKey();
+		$newApiKeyId = $this->getApiKeyService()->GetApiKeyId($newApiKey);
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
 	}
 }

controllers/RecipesApiController.php

@@ -2,19 +2,14 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\RecipesService;
-
 class RecipesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->RecipesService = new RecipesService();
 	}
 
-	protected $RecipesService;
-
-	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddNotFulfilledProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 		$excludedProductIds = null;
@@ -23,16 +18,16 @@ class RecipesApiController extends BaseApiController
 		{
 			$excludedProductIds = $requestBody['excludedProductIds'];
 		}
-		
-		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId'], $excludedProductIds);
+
+		$this->getRecipesService()->AddNotFulfilledProductsToShoppingList($args['recipeId'], $excludedProductIds);
 		return $this->EmptyApiResponse($response);
 	}
 
-	public function ConsumeRecipe(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ConsumeRecipe(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->RecipesService->ConsumeRecipe($args['recipeId']);
+			$this->getRecipesService()->ConsumeRecipe($args['recipeId']);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -41,25 +36,25 @@ class RecipesApiController extends BaseApiController
 		}
 	}
 
-	public function GetRecipeFulfillment(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetRecipeFulfillment(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
-		{ 
+		{
 			if(!isset($args['recipeId']))
 			{
-				return $this->ApiResponse($this->RecipesService->GetRecipesResolved());
+				return $this->ApiResponse($response, $this->getRecipesService()->GetRecipesResolved());
 			}
 
-			$recipeResolved = FindObjectInArrayByPropertyValue($this->RecipesService->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
+			$recipeResolved = FindObjectInArrayByPropertyValue($this->getRecipesService()->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
 			if(!$recipeResolved)
 			{
 				throw new \Exception('Recipe does not exist');
 			}
 			else
 			{
-				return $this->ApiResponse($recipeResolved);
+				return $this->ApiResponse($response, $recipeResolved);
 			}
-		} 
+		}
 		catch (\Exception $ex)
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());

controllers/RecipesController.php

@@ -3,148 +3,184 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\RecipesService;
-use \Grocy\Services\UserfieldsService;
 
 class RecipesController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->RecipesService = new RecipesService();
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $RecipesService;
-	protected $UserfieldsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		if (isset($request->getQueryParams()['include-internal']))
-		{
-			$recipes = $this->Database->recipes()->orderBy('name');
-		}
-		else
-		{
-			$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
-		}
-		$recipesResolved = $this->RecipesService->GetRecipesResolved();
+		$recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
+		$recipesResolved = $this->getRecipesService()->GetRecipesResolved();
 
 		$selectedRecipe = null;
 		$selectedRecipePositionsResolved = null;
 		if (isset($request->getQueryParams()['recipe']))
 		{
-			$selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']);
-			$selectedRecipePositionsResolved = $this->Database->recipes_pos_resolved()->where('recipe_id', $request->getQueryParams()['recipe'])->orderBy('ingredient_group');
+			$selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']);
+			$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1 AND is_nested_recipe_pos = 0', $request->getQueryParams()['recipe'])->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC');
 		}
 		else
 		{
 			foreach ($recipes as $recipe)
 			{
 				$selectedRecipe = $recipe;
-				$selectedRecipePositionsResolved = $this->Database->recipes_pos_resolved()->where('recipe_id', $recipe->id)->orderBy('ingredient_group');
+				$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1 AND is_nested_recipe_pos = 0', $recipe->id)->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC');
 				break;
 			}
 		}
 
-		$selectedRecipeSubRecipes = $this->Database->recipes()->where('id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->orderBy('name')->fetchAll();
-		$selectedRecipeSubRecipesPositions = $this->Database->recipes_pos_resolved()->where('recipe_id = :1', $selectedRecipe->id)->orderBy('ingredient_group')->fetchAll();
-
-		$includedRecipeIdsAbsolute = array();
-		$includedRecipeIdsAbsolute[] = $selectedRecipe->id;
-		foreach($selectedRecipeSubRecipes as $subRecipe)
+		if ($selectedRecipe)
 		{
-			$includedRecipeIdsAbsolute[] = $subRecipe->id;
+			$selectedRecipeSubRecipes = $this->getDatabase()->recipes()->where('id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->orderBy('name')->fetchAll();
+			$selectedRecipeSubRecipesPositions = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1', $selectedRecipe->id)->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC')->fetchAll();
+
+			$includedRecipeIdsAbsolute = array();
+			$includedRecipeIdsAbsolute[] = $selectedRecipe->id;
+			foreach($selectedRecipeSubRecipes as $subRecipe)
+			{
+				$includedRecipeIdsAbsolute[] = $subRecipe->id;
+			}
+
+			$renderArray = [
+				'recipes' => $recipes,
+				'recipesResolved' => $recipesResolved,
+				'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_type', RecipesService::RECIPE_TYPE_NORMAL),
+				'selectedRecipe' => $selectedRecipe,
+				'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
+				'products' => $this->getDatabase()->products(),
+				'quantityUnits' => $this->getDatabase()->quantity_units(),
+				'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
+				'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions,
+				'includedRecipeIdsAbsolute' => $includedRecipeIdsAbsolute,
+				'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs,
+				'selectedRecipeTotalCalories' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->calories,
+				'userfields' => $this->getUserfieldsService()->GetFields('recipes'),
+				'userfieldValues' => $this->getUserfieldsService()->GetAllValues('recipes'),
+				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
+			];
+		}
+		else
+		{
+			$renderArray = [
+				'recipes' => $recipes,
+				'recipesResolved' => $recipesResolved,
+				'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_type', RecipesService::RECIPE_TYPE_NORMAL),
+				'selectedRecipe' => $selectedRecipe,
+				'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
+				'products' => $this->getDatabase()->products(),
+				'quantityUnits' => $this->getDatabase()->quantity_units(),
+				'userfields' => $this->getUserfieldsService()->GetFields('recipes'),
+				'userfieldValues' => $this->getUserfieldsService()->GetAllValues('recipes'),
+				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
+			];
 		}
 
-		return $this->AppContainer->view->render($response, 'recipes', [
-			'recipes' => $recipes,
-			'recipesResolved' => $recipesResolved,
-			'recipePositionsResolved' => $this->Database->recipes_pos_resolved(),
-			'selectedRecipe' => $selectedRecipe,
-			'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
-			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units(),
-			'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
-			'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions,
-			'includedRecipeIdsAbsolute' => $includedRecipeIdsAbsolute,
-			'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs,
-			'userfields' => $this->UserfieldsService->GetFields('recipes'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('recipes')
-		]);
+		return $this->renderPage($response, 'recipes', $renderArray);
 	}
 
-	public function RecipeEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RecipeEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$recipeId = $args['recipeId'];
 		if ($recipeId  == 'new')
 		{
-			$newRecipe = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->createRow(array(
-				'name' => $this->LocalizationService->__t('New recipe')
+			$newRecipe = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->createRow(array(
+				'name' => $this->getLocalizationService()->__t('New recipe')
 			));
 			$newRecipe->save();
 
-			$recipeId = $this->Database->lastInsertId();
+			$recipeId = $this->getDatabase()->lastInsertId();
 		}
-		
-		return $this->AppContainer->view->render($response, 'recipeform', [
-			'recipe' =>  $this->Database->recipes($recipeId),
-			'recipePositions' =>  $this->Database->recipes_pos()->where('recipe_id', $recipeId),
+
+		return $this->renderPage($response, 'recipeform', [
+			'recipe' =>  $this->getDatabase()->recipes($recipeId),
+			'recipePositions' =>  $this->getDatabase()->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => 'edit',
-			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units(),
-			'recipePositionsResolved' => $this->RecipesService->GetRecipesPosResolved(),
-			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
-			'recipes' =>  $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name'),
-			'recipeNestings' =>  $this->Database->recipes_nestings()->where('recipe_id', $recipeId),
-			'userfields' => $this->UserfieldsService->GetFields('recipes')
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units(),
+			'recipePositionsResolved' => $this->getRecipesService()->GetRecipesPosResolved(),
+			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
+			'recipes' =>  $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name'),
+			'recipeNestings' =>  $this->getDatabase()->recipes_nestings()->where('recipe_id', $recipeId),
+			'userfields' => $this->getUserfieldsService()->GetFields('recipes'),
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 		]);
 	}
 
-	public function RecipePosEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RecipePosEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['recipePosId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'recipeposform', [
+			return $this->renderPage($response, 'recipeposform', [
 				'mode' => 'create',
-				'recipe' => $this->Database->recipes($args['recipeId']),
-				'products' => $this->Database->products()->orderBy('name'),
-				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+				'recipe' => $this->getDatabase()->recipes($args['recipeId']),
+				'recipePos' => new \stdClass(),
+				'products' => $this->getDatabase()->products()->orderBy('name'),
+				'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'recipeposform', [
+			return $this->renderPage($response, 'recipeposform', [
 				'mode' => 'edit',
-				'recipe' =>  $this->Database->recipes($args['recipeId']),
-				'recipePos' => $this->Database->recipes_pos($args['recipePosId']),
-				'products' => $this->Database->products()->orderBy('name'),
-				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+				'recipe' =>  $this->getDatabase()->recipes($args['recipeId']),
+				'recipePos' => $this->getDatabase()->recipes_pos($args['recipePosId']),
+				'products' => $this->getDatabase()->products()->orderBy('name'),
+				'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 			]);
 		}
 	}
 
-	public function MealPlan(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RecipesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll();
+		return $this->renderPage($response, 'recipessettings');
+	}
+
+	public function MealPlan(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll();
 
 		$events = array();
-		foreach($this->Database->meal_plan() as $mealPlanEntry)
+		foreach($this->getDatabase()->meal_plan() as $mealPlanEntry)
 		{
+			$recipe = FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id']);
+			$title = '';
+			if ($recipe !== null)
+			{
+				$title = $recipe->name;
+			}
+
+			$productDetails = null;
+			if ($mealPlanEntry['product_id'] !== null)
+			{
+				$productDetails = $this->getStockService()->GetProductDetails($mealPlanEntry['product_id']);
+			}
+
 			$events[] = array(
 				'id' => $mealPlanEntry['id'],
-				'title' => FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id'])->name,
+				'title' => $title,
 				'start' => $mealPlanEntry['day'],
 				'date_format' => 'date',
-				'recipe' => json_encode(FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id'])),
-				'mealPlanEntry' => json_encode($mealPlanEntry)
+				'recipe' => json_encode($recipe),
+				'mealPlanEntry' => json_encode($mealPlanEntry),
+				'type' => $mealPlanEntry['type'],
+				'productDetails' => json_encode($productDetails)
 			);
 		}
 
-		return $this->AppContainer->view->render($response, 'mealplan', [
+		return $this->renderPage($response, 'mealplan', [
 			'fullcalendarEventSources' => $events,
 			'recipes' => $recipes,
-			'internalRecipes' => $this->Database->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
-			'recipesResolved' => $this->RecipesService->GetRecipesResolved()
+			'internalRecipes' => $this->getDatabase()->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
+			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 		]);
 	}
 }

controllers/StockApiController.php

@@ -6,19 +6,16 @@ use \Grocy\Services\StockService;
 
 class StockApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->StockService = new StockService();
 	}
 
-	protected $StockService;
-
-	public function ProductDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->StockService->GetProductDetails($args['productId']));
+			return $this->ApiResponse($response, $this->getStockService()->GetProductDetails($args['productId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -26,12 +23,12 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ProductDetailsByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductDetailsByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$productId = $this->StockService->GetProductIdFromBarcode($args['barcode']);
-			return $this->ApiResponse($this->StockService->GetProductDetails($productId));
+			$productId = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->ApiResponse($response, $this->getStockService()->GetProductDetails($productId));
 		}
 		catch (\Exception $ex)
 		{
@@ -39,11 +36,11 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ProductPriceHistory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductPriceHistory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->StockService->GetProductPriceHistory($args['productId']));
+			return $this->ApiResponse($response, $this->getStockService()->GetProductPriceHistory($args['productId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -51,7 +48,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function AddProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -67,7 +64,7 @@ class StockApiController extends BaseApiController
 				throw new \Exception('An amount is required');
 			}
 
-			$bestBeforeDate = date('Y-m-d');
+			$bestBeforeDate = null;
 			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
 			{
 				$bestBeforeDate = $requestBody['best_before_date'];
@@ -85,14 +82,20 @@ class StockApiController extends BaseApiController
 				$locationId = $requestBody['location_id'];
 			}
 
+			$shoppingLocationId = null;
+			if (array_key_exists('shopping_location_id', $requestBody) && is_numeric($requestBody['shopping_location_id']))
+			{
+				$shoppingLocationId = $requestBody['shopping_location_id'];
+			}
+
 			$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
 			if (array_key_exists('transaction_type', $requestBody)  && !empty($requestBody['transactiontype']))
 			{
 				$transactionType = $requestBody['transactiontype'];
 			}
 
-			$bookingId = $this->StockService->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId);
-			return $this->ApiResponse($this->Database->stock_log($bookingId));
+			$bookingId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId, $shoppingLocationId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -100,10 +103,128 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ConsumeProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->AddProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function EditStockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$bestBeforeDate = null;
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$shoppingLocationId = null;
+			if (array_key_exists('shopping_location_id', $requestBody) && is_numeric($requestBody['shopping_location_id']))
+			{
+				$shoppingLocationId = $requestBody['shopping_location_id'];
+			}
+
+			$bookingId = $this->getStockService()->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $shoppingLocationId, $price, $requestBody['open'], $requestBody['purchased_date']);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function TransferProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			if (!array_key_exists('location_id_from', $requestBody))
+			{
+				throw new \Exception('A transfer from location is required');
+			}
+
+			if (!array_key_exists('location_id_to', $requestBody))
+			{
+				throw new \Exception('A transfer to location is required');
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$bookingId = $this->getStockService()->TransferProduct($args['productId'], $requestBody['amount'], $requestBody['location_id_from'], $requestBody['location_id_to'], $specificStockEntryId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function TransferProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->TransferProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ConsumeProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		$result = null;
+
 		try
 		{
 			if ($requestBody === null)
@@ -134,14 +255,34 @@ class StockApiController extends BaseApiController
 				$specificStockEntryId = $requestBody['stock_entry_id'];
 			}
 
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
 			$recipeId = null;
 			if (array_key_exists('recipe_id', $requestBody) && is_numeric($requestBody['recipe_id']))
 			{
 				$recipeId = $requestBody['recipe_id'];
 			}
 
-			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId);
-			return $this->ApiResponse($this->Database->stock_log($bookingId));
+			$bookingId = $this->getStockService()->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId, $locationId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			$result = $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+		return $result;
+	}
+
+	public function ConsumeProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->ConsumeProduct($request, $response, $args);
 		}
 		catch (\Exception $ex)
 		{
@@ -149,7 +290,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function InventoryProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function InventoryProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -165,7 +306,7 @@ class StockApiController extends BaseApiController
 				throw new \Exception('An new amount is required');
 			}
 
-			$bestBeforeDate = date('Y-m-d');
+			$bestBeforeDate = null;
 			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
 			{
 				$bestBeforeDate = $requestBody['best_before_date'];
@@ -183,8 +324,14 @@ class StockApiController extends BaseApiController
 				$price = $requestBody['price'];
 			}
 
-			$bookingId = $this->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price);
-			return $this->ApiResponse($this->Database->stock_log($bookingId));
+			$shoppingLocationId = null;
+			if (array_key_exists('shopping_location_id', $requestBody) && is_numeric($requestBody['shopping_location_id']))
+			{
+				$shoppingLocationId = $requestBody['shopping_location_id'];
+			}
+
+			$bookingId = $this->getStockService()->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price, $shoppingLocationId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -192,7 +339,20 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function OpenProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function InventoryProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->InventoryProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function OpenProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -214,8 +374,8 @@ class StockApiController extends BaseApiController
 				$specificStockEntryId = $requestBody['stock_entry_id'];
 			}
 
-			$bookingId = $this->StockService->OpenProduct($args['productId'], $requestBody['amount'], $specificStockEntryId);
-			return $this->ApiResponse($this->Database->stock_log($bookingId));
+			$bookingId = $this->getStockService()->OpenProduct($args['productId'], $requestBody['amount'], $specificStockEntryId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -223,12 +383,25 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function CurrentStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function OpenProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->StockService->GetCurrentStock());
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->OpenProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 
-	public function CurrentVolatilStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CurrentStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getStockService()->GetCurrentStock());
+	}
+
+	public function CurrentVolatileStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$nextXDays = 5;
 		if (isset($request->getQueryParams()['expiring_days']) && !empty($request->getQueryParams()['expiring_days']) && is_numeric($request->getQueryParams()['expiring_days']))
@@ -236,17 +409,17 @@ class StockApiController extends BaseApiController
 			$nextXDays = $request->getQueryParams()['expiring_days'];
 		}
 
-		$expiringProducts = $this->StockService->GetExpiringProducts($nextXDays, true);
-		$expiredProducts = $this->StockService->GetExpiringProducts(-1);
-		$missingProducts = $this->StockService->GetMissingProducts();
-		return $this->ApiResponse(array(
+		$expiringProducts = $this->getStockService()->GetExpiringProducts($nextXDays, true);
+		$expiredProducts = $this->getStockService()->GetExpiringProducts(-1);
+		$missingProducts = $this->getStockService()->GetMissingProducts();
+		return $this->ApiResponse($response, array(
 			 'expiring_products' => $expiringProducts,
 			 'expired_products' => $expiredProducts,
 			 'missing_products' => $missingProducts
 		));
 	}
 
-	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddMissingProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -258,7 +431,7 @@ class StockApiController extends BaseApiController
 				$listId = intval($requestBody['list_id']);
 			}
 
-			$this->StockService->AddMissingProductsToShoppingList($listId);
+			$this->getStockService()->AddMissingProductsToShoppingList($listId);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -267,7 +440,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ClearShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ClearShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -279,7 +452,7 @@ class StockApiController extends BaseApiController
 				$listId = intval($requestBody['list_id']);
 			}
 
-			$this->StockService->ClearShoppingList($listId);
+			$this->getStockService()->ClearShoppingList($listId);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -288,7 +461,85 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ExternalBarcodeLookup(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+
+	public function AddProductToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			$amount = 1;
+			$productId = null;
+			$note = null;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+			if (array_key_exists('product_amount', $requestBody) && !empty($requestBody['product_amount']) && is_numeric($requestBody['product_amount']))
+			{
+				$amount = intval($requestBody['product_amount']);
+			}
+			if (array_key_exists('product_id', $requestBody) && !empty($requestBody['product_id']) && is_numeric($requestBody['product_id']))
+			{
+				$productId = intval($requestBody['product_id']);
+			}
+			if (array_key_exists('note', $requestBody) && !empty($requestBody['note']))
+			{
+				$note = $requestBody['note'];
+			}
+
+			if ($productId == null)
+			{
+				throw new \Exception("No product id was supplied");
+			}
+
+			$this->getStockService()->AddProductToShoppingList($productId, $amount, $note, $listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function RemoveProductFromShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			$amount = 1;
+			$productId = null;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+			if (array_key_exists('product_amount', $requestBody) && !empty($requestBody['product_amount']) && is_numeric($requestBody['product_amount']))
+			{
+				$amount = intval($requestBody['product_amount']);
+			}
+			if (array_key_exists('product_id', $requestBody) && !empty($requestBody['product_id']) && is_numeric($requestBody['product_id']))
+			{
+				$productId = intval($requestBody['product_id']);
+			}
+
+			if ($productId == null)
+			{
+				throw new \Exception("No product id was supplied");
+			}
+
+			$this->getStockService()->RemoveProductFromShoppingList($productId, $amount, $listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ExternalBarcodeLookup(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -298,7 +549,7 @@ class StockApiController extends BaseApiController
 				$addFoundProduct = true;
 			}
 			
-			return $this->ApiResponse($this->StockService->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
+			return $this->ApiResponse($response, $this->getStockService()->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
 		}
 		catch (\Exception $ex)
 		{
@@ -306,11 +557,11 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function UndoBooking(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->StockService->UndoBooking($args['bookingId']));
+			$this->ApiResponse($response, $this->getStockService()->UndoBooking($args['bookingId']));
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -319,8 +570,75 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ProductStockEntries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoTransaction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->StockService->GetProductStockEntries($args['productId']));
+		try
+		{
+			$this->ApiResponse($response, $this->getStockService()->UndoTransaction($args['transactionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ProductStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$allowSubproductSubstitution = false;
+		if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN))
+		{
+			$allowSubproductSubstitution = true;
+		}
+
+		return $this->ApiResponse($response, $this->getStockService()->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution));
+	}
+
+	public function ProductStockLocations(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getStockService()->GetProductStockLocations($args['productId']));
+	}
+
+	public function StockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getStockService()->GetStockEntry($args['entryId']));
+	}
+
+	public function StockBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$stockLogRow = $this->getDatabase()->stock_log($args['bookingId']);
+
+			if ($stockLogRow === null)
+			{
+				throw new \Exception('Stock booking does not exist');
+			}
+			
+			return $this->ApiResponse($response, $stockLogRow);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function StockTransactions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$transactionRows = $this->getDatabase()->stock_log()->where('transaction_id = :1', $args['transactionId'])->fetchAll();
+
+			if (count($transactionRows) === 0)
+			{
+				throw new \Exception('No transaction was found by the given transaction id');
+			}
+			
+			return $this->ApiResponse($response, $transactionRows);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 }

controllers/StockController.php

@@ -2,67 +2,99 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\StockService;
-use \Grocy\Services\UsersService;
-use \Grocy\Services\UserfieldsService;
-
 class StockController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->StockService = new StockService();
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $StockService;
-	protected $UserfieldsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$usersService = new UsersService();
+		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
 
-		return $this->AppContainer->view->render($response, 'stockoverview', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'currentStock' => $this->StockService->GetCurrentStock(),
-			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
-			'missingProducts' => $this->StockService->GetMissingProducts(),
+		return $this->renderPage($response, 'stockoverview', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'currentStock' => $this->getStockService()->GetCurrentStock(true),
+			'currentStockLocations' => $this->getStockService()->GetCurrentStockLocations(),
+			'missingProducts' => $this->getStockService()->GetMissingProducts(),
 			'nextXDays' => $nextXDays,
-			'productGroups' => $this->Database->product_groups()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('products'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products'),
+			'shoppingListItems' => $this->getDatabase()->shopping_list(),
 		]);
 	}
 
-	public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Stockentries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'purchase', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name')
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
+		return $this->renderPage($response, 'stockentries', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+			'stockEntries' => $this->getDatabase()->stock()->orderBy('product_id'),
+			'currentStockLocations' => $this->getStockService()->GetCurrentStockLocations(),
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function Consume(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Purchase(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'consume', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'recipes' => $this->Database->recipes()->orderBy('name')
+		return $this->renderPage($response, 'purchase', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function Inventory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Consume(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'inventory', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name')
+		return $this->renderPage($response, 'consume', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'recipes' => $this->getDatabase()->recipes()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function ShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'transfer', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'recipes' => $this->getDatabase()->recipes()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
+		]);
+	}
+
+	public function Inventory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'inventory', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
+		]);
+	}
+
+	public function StockEntryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'stockentryform', [
+			'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
+		]);
+	}
+
+	public function ShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$listId = 1;
 		if (isset($request->getQueryParams()['list']))
@@ -70,196 +102,299 @@ class StockController extends BaseController
 			$listId = $request->getQueryParams()['list'];
 		}
 
-		return $this->AppContainer->view->render($response, 'shoppinglist', [
-			'listItems' => $this->Database->shopping_list()->where('shopping_list_id = :1', $listId),
-			'products' => $this->Database->products()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'missingProducts' => $this->StockService->GetMissingProducts(),
-			'productGroups' => $this->Database->product_groups()->orderBy('name'),
-			'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
-			'selectedShoppingListId' => $listId
+		return $this->renderPage($response, 'shoppinglist', [
+			'listItems' => $this->getDatabase()->shopping_list()->where('shopping_list_id = :1', $listId),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'missingProducts' => $this->getStockService()->GetMissingProducts(),
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name'),
+			'selectedShoppingListId' => $listId,
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function ProductsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'products', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'productGroups' => $this->Database->product_groups()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('products'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
+		return $this->renderPage($response, 'products', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function StockSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function StockSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'stocksettings', [
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+		return $this->renderPage($response, 'stocksettings', [
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name')
 		]);
 	}
 
-	public function LocationsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'locations', [
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('locations'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('locations')
+		return $this->renderPage($response, 'locations', [
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('locations'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('locations')
 		]);
 	}
 
-	public function ProductGroupsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingLocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'productgroups', [
-			'productGroups' => $this->Database->product_groups()->orderBy('name'),
-			'products' => $this->Database->products()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('product_groups'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('product_groups')
+		return $this->renderPage($response, 'shoppinglocations', [
+			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('shopping_locations')
 		]);
 	}
 
-	public function QuantityUnitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductGroupsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'quantityunits', [
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('quantity_units')
+		return $this->renderPage($response, 'productgroups', [
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('product_groups'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('product_groups')
 		]);
 	}
 
-	public function ProductEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function QuantityUnitsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'quantityunits', [
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('quantity_units')
+		]);
+	}
+
+	public function ProductEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['productId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'productform', [
-				'locations' =>  $this->Database->locations()->orderBy('name'),
-				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
-				'productgroups' => $this->Database->product_groups()->orderBy('name'),
-				'userfields' => $this->UserfieldsService->GetFields('products'),
+			return $this->renderPage($response, 'productform', [
+				'locations' =>  $this->getDatabase()->locations()->orderBy('name'),
+				'quantityunits' =>  $this->getDatabase()->quantity_units()->orderBy('name'),
+				'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+				'productgroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+				'userfields' => $this->getUserfieldsService()->GetFields('products'),
+				'products' => $this->getDatabase()->products()->where('parent_product_id IS NULL')->orderBy('name'),
+				'isSubProductOfOthers' => false,
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'productform', [
-				'product' =>  $this->Database->products($args['productId']),
-				'locations' =>  $this->Database->locations()->orderBy('name'),
-				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
-				'productgroups' => $this->Database->product_groups()->orderBy('name'),
-				'userfields' => $this->UserfieldsService->GetFields('products'),
-				'mode' => 'edit'
+			$product = $this->getDatabase()->products($args['productId']);
+
+			return $this->renderPage($response, 'productform', [
+				'product' =>  $product,
+				'locations' =>  $this->getDatabase()->locations()->orderBy('name'),
+				'quantityunits' =>  $this->getDatabase()->quantity_units()->orderBy('name'),
+				'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name'),
+				'productgroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+				'userfields' => $this->getUserfieldsService()->GetFields('products'),
+				'products' => $this->getDatabase()->products()->where('id != :1 AND parent_product_id IS NULL', $product->id)->orderBy('name'),
+				'isSubProductOfOthers' => $this->getDatabase()->products()->where('parent_product_id = :1', $product->id)->count() !== 0,
+				'mode' => 'edit',
+				'quConversions' => $this->getDatabase()->quantity_unit_conversions()
 			]);
 		}
 	}
 
-	public function LocationEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['locationId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'locationform', [
+			return $this->renderPage($response, 'locationform', [
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('locations')
+				'userfields' => $this->getUserfieldsService()->GetFields('locations')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'locationform', [
-				'location' =>  $this->Database->locations($args['locationId']),
+			return $this->renderPage($response, 'locationform', [
+				'location' =>  $this->getDatabase()->locations($args['locationId']),
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('locations')
+				'userfields' => $this->getUserfieldsService()->GetFields('locations')
 			]);
 		}
 	}
 
-	public function ProductGroupEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingLocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($args['shoppingLocationId'] == 'new')
+		{
+			return $this->renderPage($response, 'shoppinglocationform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations')
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'shoppinglocationform', [
+				'shoppinglocation' =>  $this->getDatabase()->shopping_locations($args['shoppingLocationId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations')
+			]);
+		}
+	}
+
+	public function ProductGroupEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['productGroupId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'productgroupform', [
+			return $this->renderPage($response, 'productgroupform', [
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('product_groups')
+				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'productgroupform', [
-				'group' =>  $this->Database->product_groups($args['productGroupId']),
+			return $this->renderPage($response, 'productgroupform', [
+				'group' =>  $this->getDatabase()->product_groups($args['productGroupId']),
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('product_groups')
+				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
 			]);
 		}
 	}
 
-	public function QuantityUnitEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function QuantityUnitEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['quantityunitId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'quantityunitform', [
+			return $this->renderPage($response, 'quantityunitform', [
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
-				'pluralCount' => $this->LocalizationService->GetPluralCount(),
-				'pluralRule' => $this->LocalizationService->GetPluralDefinition()
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
+				'pluralCount' => $this->getLocalizationService()->GetPluralCount(),
+				'pluralRule' => $this->getLocalizationService()->GetPluralDefinition()
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'quantityunitform', [
-				'quantityunit' =>  $this->Database->quantity_units($args['quantityunitId']),
+			$quantityUnit = $this->getDatabase()->quantity_units($args['quantityunitId']);
+
+			return $this->renderPage($response, 'quantityunitform', [
+				'quantityUnit' =>  $quantityUnit,
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
-				'pluralCount' => $this->LocalizationService->GetPluralCount(),
-				'pluralRule' => $this->LocalizationService->GetPluralDefinition()
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
+				'pluralCount' => $this->getLocalizationService()->GetPluralCount(),
+				'pluralRule' => $this->getLocalizationService()->GetPluralDefinition(),
+				'defaultQuConversions' => $this->getDatabase()->quantity_unit_conversions()->where('from_qu_id = :1 AND product_id IS NULL', $quantityUnit->id),
+				'quantityUnits' => $this->getDatabase()->quantity_units()
 			]);
 		}
 	}
 
-	public function ShoppingListItemEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingListItemEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['itemId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistitemform', [
-				'products' =>  $this->Database->products()->orderBy('name'),
-				'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+			return $this->renderPage($response, 'shoppinglistitemform', [
+				'products' =>  $this->getDatabase()->products()->orderBy('name'),
+				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name'),
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistitemform', [
-				'listItem' =>  $this->Database->shopping_list($args['itemId']),
-				'products' =>  $this->Database->products()->orderBy('name'),
-				'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+			return $this->renderPage($response, 'shoppinglistitemform', [
+				'listItem' =>  $this->getDatabase()->shopping_list($args['itemId']),
+				'products' =>  $this->getDatabase()->products()->orderBy('name'),
+				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name'),
 				'mode' => 'edit'
 			]);
 		}
 	}
 
-	public function ShoppingListEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingListEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['listId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistform', [
+			return $this->renderPage($response, 'shoppinglistform', [
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistform', [
-				'shoppingList' =>  $this->Database->shopping_lists($args['listId']),
+			return $this->renderPage($response, 'shoppinglistform', [
+				'shoppingList' =>  $this->getDatabase()->shopping_lists($args['listId']),
 				'mode' => 'edit'
 			]);
 		}
 	}
 
-	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'stockjournal', [
-			'stockLog' => $this->Database->stock_log()->orderBy('row_created_timestamp', 'DESC'),
-			'products' => $this->Database->products()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
+		return $this->renderPage($response, 'shoppinglistsettings');
+	}
+
+	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'stockjournal', [
+			'stockLog' => $this->getDatabase()->stock_log()->orderBy('row_created_timestamp', 'DESC'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name')
+		]);
+	}
+
+	public function LocationContentSheet(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'locationcontentsheet', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'currentStockLocationContent' => $this->getStockService()->GetCurrentStockLocationContent()
+		]);
+	}
+
+	public function QuantityUnitConversionEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$product = null;
+		if (isset($request->getQueryParams()['product']))
+		{
+			$product = $this->getDatabase()->products($request->getQueryParams()['product']);
+		}
+
+		$defaultQuUnit = null;
+		if (isset($request->getQueryParams()['qu-unit']))
+		{
+			$defaultQuUnit = $this->getDatabase()->quantity_units($request->getQueryParams()['qu-unit']);
+		}
+
+		if ($args['quConversionId'] == 'new')
+		{
+			return $this->renderPage($response, 'quantityunitconversionform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_unit_conversions'),
+				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'product' => $product,
+				'defaultQuUnit' => $defaultQuUnit
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'quantityunitconversionform', [
+				'quConversion' =>  $this->getDatabase()->quantity_unit_conversions($args['quConversionId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_unit_conversions'),
+				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'product' => $product,
+				'defaultQuUnit' => $defaultQuUnit
+			]);
+		}
+	}
+
+	public function QuantityUnitPluralFormTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'quantityunitpluraltesting', [
+			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name')
 		]);
 	}
 }

controllers/SystemApiController.php

@@ -2,29 +2,50 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\DatabaseService;
-use \Grocy\Services\ApplicationService;
-
 class SystemApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->DatabaseService = new DatabaseService();
-		$this->ApplicationService = new ApplicationService();
 	}
 
-	protected $DatabaseService;
-	protected $ApplicationService;
-
-	public function GetDbChangedTime(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetDbChangedTime(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse(array(
-			'changed_time' => $this->DatabaseService->GetDbChangedTime()
-		));
+        return $this->ApiResponse($response, array(
+            'changed_time' => $this->getDatabaseService()->GetDbChangedTime()
+        ));
 	}
 
-	public function LogMissingLocalization(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetConfig(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$constants = get_defined_constants();
+
+			// Some GROCY_* constants are not really config settings and therefore should not be exposed
+			unset($constants['GROCY_AUTHENTICATED']);
+			unset($constants['GROCY_DATAPATH']);
+			unset($constants['GROCY_IS_EMBEDDED_INSTALL']);
+			unset($constants['GROCY_USER_ID']);
+
+			$returnArray = array();
+			foreach ($constants as $constant => $value)
+			{
+				if (substr($constant, 0, 6) === 'GROCY_')
+				{
+					$returnArray[substr($constant, 6)] = $value;
+				}
+			}
+
+			return $this->ApiResponse($response, $returnArray);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function LogMissingLocalization(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if (GROCY_MODE === 'dev')
 		{
@@ -32,18 +53,18 @@ class SystemApiController extends BaseApiController
 			{
 				$requestBody = $request->getParsedBody();
 
-				$this->LocalizationService->CheckAndAddMissingTranslationToPot($requestBody['text']);
+				$this->getLocalizationService()->CheckAndAddMissingTranslationToPot($requestBody['text']);
 				return $this->EmptyApiResponse($response);
 			}
 			catch (\Exception $ex)
 			{
 				return $this->GenericErrorResponse($response, $ex->getMessage());
 			}
-		}	
+		}
 	}
 
-	public function GetSystemInfo(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetSystemInfo(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->ApplicationService->GetSystemInfo());
+		return $this->ApiResponse($response, $this->getApplicationService()->GetSystemInfo());
 	}
 }

controllers/SystemController.php

@@ -2,60 +2,105 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ApplicationService;
 use \Grocy\Services\DatabaseMigrationService;
 use \Grocy\Services\DemoDataGeneratorService;
 
 class SystemController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ApplicationService = new ApplicationService();
 	}
 
-	protected $ApplicationService;
-
-	public function Root(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Root(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		// Schema migration is done here
-		$databaseMigrationService = new DatabaseMigrationService();
+		$databaseMigrationService = DatabaseMigrationService::getInstance();
 		$databaseMigrationService->MigrateDatabase();
 
-		if (GROCY_IS_DEMO_INSTALL)
+		if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
 		{
-			$demoDataGeneratorService = new DemoDataGeneratorService();
+			$demoDataGeneratorService = DemoDataGeneratorService::getInstance();
 			$demoDataGeneratorService->PopulateDemoData();
 		}
 
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl($this->GetEntryPageRelative()));
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl($this->GetEntryPageRelative()));
 	}
 
-	public function About(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	/**
+	 * Get the entry page of the application based on the value of the entry page setting.
+	 *
+	 * We fallback to the about page when no entry page is specified or
+	 * when the specified entry page has been disabled.
+	 *
+	 * @return string
+	 */
+	private function GetEntryPageRelative()
 	{
-		return $this->AppContainer->view->render($response, 'about', [
-			'system_info' => $this->ApplicationService->GetSystemInfo(),
-			'changelog' => $this->ApplicationService->GetChangelog()
+		if (defined('GROCY_ENTRY_PAGE')) {
+			$entryPage = constant('GROCY_ENTRY_PAGE');
+		} else {
+			$entryPage = 'stock';
+		}
+
+		// Stock
+		if ($entryPage === 'stock' && constant('GROCY_FEATURE_FLAG_STOCK')) {
+			return '/stockoverview';
+		}
+
+		// Shoppinglist
+		if ($entryPage === 'shoppinglist' && constant('GROCY_FEATURE_FLAG_SHOPPINGLIST')) {
+			return '/shoppinglist';
+		}
+
+		// Recipes
+		if ($entryPage === 'recipes' && constant('GROCY_FEATURE_FLAG_RECIPES')) {
+			return '/recipes';
+		}
+
+		// Chores
+		if ($entryPage === 'chores' && constant('GROCY_FEATURE_FLAG_CHORES')) {
+			return '/choresoverview';
+		}
+
+		// Tasks
+		if ($entryPage === 'tasks' && constant('GROCY_FEATURE_FLAG_TASKS')) {
+			return '/tasks';
+		}
+
+		// Batteries
+		if ($entryPage === 'batteries' && constant('GROCY_FEATURE_FLAG_BATTERIES')) {
+			return '/batteriesoverview';
+		}
+
+		if ($entryPage === 'equipment' && constant('GROCY_FEATURE_FLAG_EQUIPMENT')) {
+			return '/equipment';
+		}
+
+		// Calendar
+		if ($entryPage === 'calendar' && constant('GROCY_FEATURE_FLAG_CALENDAR')) {
+			return '/calendar';
+		}
+
+		// Meal Plan
+		if ($entryPage === 'mealplan' && constant('GROCY_FEATURE_FLAG_RECIPES')) {
+			return '/mealplan';
+		}
+
+		return '/about';
+	}
+
+	public function About(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'about', [
+			'system_info' => $this->getApplicationService()->GetSystemInfo(),
+			'changelog' => $this->getApplicationService()->GetChangelog()
 		]);
 	}
 
-	private function GetEntryPageRelative()
+	public function BarcodeScannerTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		$entryPage = '/stockoverview';
-
-		if (!GROCY_FEATURE_FLAG_STOCK)
-		{
-			$entryPage = '/choresoverview';
-		}
-		if (!GROCY_FEATURE_FLAG_CHORES)
-		{
-			$entryPage = '/batteriesoverview';
-		}
-		if (!GROCY_FEATURE_FLAG_BATTERIES)
-		{
-			$entryPage = '/equipment';
-		}
-
-		return $entryPage;
+		return $this->renderPage($response, 'barcodescannertesting');
 	}
 }

controllers/TasksApiController.php

@@ -2,24 +2,19 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\TasksService;
-
 class TasksApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->TasksService = new TasksService();
 	}
 
-	protected $TasksService;
-
-	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->TasksService->GetCurrent());
+		return $this->ApiResponse($response, $this->getTasksService()->GetCurrent());
 	}
 
-	public function MarkTaskAsCompleted(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function MarkTaskAsCompleted(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -31,7 +26,7 @@ class TasksApiController extends BaseApiController
 				$doneTime = $requestBody['done_time'];
 			}
 
-			$this->TasksService->MarkTaskAsCompleted($args['taskId'], $doneTime);
+			$this->getTasksService()->MarkTaskAsCompleted($args['taskId'], $doneTime);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -40,11 +35,11 @@ class TasksApiController extends BaseApiController
 		}
 	}
 
-	public function UndoTask(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoTask(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->TasksService->UndoTask($args['taskId']);
+			$this->getTasksService()->UndoTask($args['taskId']);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)

controllers/TasksController.php

@@ -2,99 +2,90 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\TasksService;
-use \Grocy\Services\UsersService;
-use \Grocy\Services\UserfieldsService;
-
 class TasksController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->TasksService = new TasksService();
-		$this->UserfieldsService = new UserfieldsService();
 	}
 
-	protected $TasksService;
-	protected $UserfieldsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if (isset($request->getQueryParams()['include_done']))
 		{
-			$tasks = $this->Database->tasks()->orderBy('name');
+			$tasks = $this->getDatabase()->tasks()->orderBy('name');
 		}
 		else
 		{
-			$tasks = $this->TasksService->GetCurrent();
+			$tasks = $this->getTasksService()->GetCurrent();
 		}
 
-		$usersService = new UsersService();
+		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
 
-		return $this->AppContainer->view->render($response, 'tasks', [
+		return $this->renderPage($response, 'tasks', [
 			'tasks' => $tasks,
 			'nextXDays' => $nextXDays,
-			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-			'users' => $this->Database->users(),
-			'userfields' => $this->UserfieldsService->GetFields('tasks'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('tasks')
+			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+			'users' => $this->getDatabase()->users(),
+			'userfields' => $this->getUserfieldsService()->GetFields('tasks'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('tasks')
 		]);
 	}
 
-	public function TaskEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TaskEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['taskId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'taskform', [
+			return $this->renderPage($response, 'taskform', [
 				'mode' => 'create',
-				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-				'users' => $this->Database->users()->orderBy('username'),
-				'userfields' => $this->UserfieldsService->GetFields('tasks')
+				'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+				'users' => $this->getDatabase()->users()->orderBy('username'),
+				'userfields' => $this->getUserfieldsService()->GetFields('tasks')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'taskform', [
-				'task' =>  $this->Database->tasks($args['taskId']),
+			return $this->renderPage($response, 'taskform', [
+				'task' =>  $this->getDatabase()->tasks($args['taskId']),
 				'mode' => 'edit',
-				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-				'users' => $this->Database->users()->orderBy('username'),
-				'userfields' => $this->UserfieldsService->GetFields('tasks')
+				'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+				'users' => $this->getDatabase()->users()->orderBy('username'),
+				'userfields' => $this->getUserfieldsService()->GetFields('tasks')
 			]);
 		}
 	}
 
-	public function TaskCategoriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TaskCategoriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'taskcategories', [
-			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('task_categories'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('task_categories')
+		return $this->renderPage($response, 'taskcategories', [
+			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('task_categories'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('task_categories')
 		]);
 	}
 
-	public function TaskCategoryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TaskCategoryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['categoryId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'taskcategoryform', [
+			return $this->renderPage($response, 'taskcategoryform', [
 				'mode' => 'create',
-				'userfields' => $this->UserfieldsService->GetFields('task_categories')
+				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'taskcategoryform', [
-				'category' =>  $this->Database->task_categories($args['categoryId']),
+			return $this->renderPage($response, 'taskcategoryform', [
+				'category' =>  $this->getDatabase()->task_categories($args['categoryId']),
 				'mode' => 'edit',
-				'userfields' => $this->UserfieldsService->GetFields('task_categories')
+				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
 			]);
 		}
 	}
 
-	public function TasksSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'taskssettings');
+		return $this->renderPage($response, 'taskssettings');
 	}
 }

controllers/UsersApiController.php

@@ -2,23 +2,18 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\UsersService;
-
 class UsersApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->UsersService = new UsersService();
 	}
 
-	protected $UsersService;
-
-	public function GetUsers(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetUsers(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->UsersService->GetUsersAsDto());
+			return $this->ApiResponse($response, $this->getUsersService()->GetUsersAsDto());
 		}
 		catch (\Exception $ex)
 		{
@@ -26,7 +21,7 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function CreateUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CreateUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -37,7 +32,7 @@ class UsersApiController extends BaseApiController
 				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
 			}
 
-			$this->UsersService->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			$this->getUsersService()->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -46,11 +41,11 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function DeleteUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DeleteUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->UsersService->DeleteUser($args['userId']);
+			$this->getUsersService()->DeleteUser($args['userId']);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -59,13 +54,13 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function EditUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->UsersService->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			$this->getUsersService()->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -74,12 +69,11 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function GetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetUserSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$value = $this->UsersService->GetUserSetting(GROCY_USER_ID, $args['settingKey']);
-			return $this->ApiResponse(array('value' => $value));
+			return $this->ApiResponse($response, $this->getUsersService()->GetUserSettings(GROCY_USER_ID));
 		}
 		catch (\Exception $ex)
 		{
@@ -87,13 +81,26 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function SetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$value = $this->getUsersService()->GetUserSetting(GROCY_USER_ID, $args['settingKey']);
+			return $this->ApiResponse($response, array('value' => $value));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function SetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
 			$requestBody = $request->getParsedBody();
 
-			$value = $this->UsersService->SetUserSetting(GROCY_USER_ID, $args['settingKey'], $requestBody['value']);
+			$value = $this->getUsersService()->SetUserSetting(GROCY_USER_ID, $args['settingKey'], $requestBody['value']);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)

controllers/UsersController.php

@@ -4,25 +4,25 @@ namespace Grocy\Controllers;
 
 class UsersController extends BaseController
 {
-	public function UsersList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UsersList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'users', [
-			'users' => $this->Database->users()->orderBy('username')
+		return $this->renderPage($response, 'users', [
+			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
 
-	public function UserEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['userId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'userform', [
+			return $this->renderPage($response, 'userform', [
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'userform', [
-				'user' =>  $this->Database->users($args['userId']),
+			return $this->renderPage($response, 'userform', [
+				'user' =>  $this->getDatabase()->users($args['userId']),
 				'mode' => 'edit'
 			]);
 		}

data/.htaccess

@@ -0,0 +1 @@
+Deny from all

data/plugins/DemoBarcodeLookupPlugin.php

@@ -14,7 +14,7 @@ class DemoBarcodeLookupPlugin extends BaseBarcodeLookupPlugin
 
 	/*
 		To try it:
-		Call the API function at /api/stock/external-barcode-lookup/{barcode}
+		Call the API function at /api/stock/barcodes/external-lookup/{barcode}
 
 		When you also add ?add=true as a query parameter to the API call,
 		on a successful lookup the product is added to the database and in the output

helpers/PrerequisiteChecker.php

@@ -0,0 +1,62 @@
+<?php
+
+class ERequirementNotMet extends Exception { }
+
+const REQUIRED_PHP_EXTENSIONS = array('fileinfo', 'pdo_sqlite', 'gd');
+
+class PrerequisiteChecker
+{
+    public function checkRequirements()
+    {
+        self::checkForConfigFile();
+        self::checkForConfigDistFile();
+        self::checkForComposer();
+        self::checkForYarn();
+        self::checkForPhpExtensions();
+    }
+    
+    
+    private function checkForConfigFile()
+    {
+        if (!file_exists(__DIR__ . '/../data/config.php'))
+        {
+            throw new ERequirementNotMet('/data/config.php not found. Have you copied config-dist.php to the data directory and renamed it to config.php?');
+        }
+    }
+
+    private function checkForConfigDistFile()
+    {
+        if (!file_exists(__DIR__ . '/../config-dist.php'))
+        {
+            throw new ERequirementNotMet('config-dist.php not found. Please do not remove this file.');
+        }
+    }
+
+    private function checkForComposer()
+    {
+        if (!file_exists(__DIR__ . '/../vendor/autoload.php'))
+        {
+            throw new ERequirementNotMet('/vendor/autoload.php not found. Have you run Composer?');
+        }
+    }
+
+    private function checkForYarn()
+    {
+        if (!file_exists(__DIR__ . '/../public/node_modules'))
+        {
+            throw new ERequirementNotMet('/public/node_modules not found. Have you run Yarn?');
+        }
+    }
+
+    private function checkForPhpExtensions()
+    {
+        $loadedExtensions = get_loaded_extensions();
+        foreach (REQUIRED_PHP_EXTENSIONS as $extension)
+        {
+            if (!in_array($extension, $loadedExtensions))
+            {
+                throw new ERequirementNotMet("PHP module '{$extension}' not installed, but required.");
+            }
+        }
+    }
+}

helpers/extensions.php

@@ -82,16 +82,26 @@ function SumArrayValue($array, $propertyName)
 	$sum = 0;
 	foreach($array as $object)
 	{
-		$sum += $object->{$propertyName};
+		$sum += floatval($object->{$propertyName});
 	}
 
 	return $sum;
 }
 
-function GetClassConstants($className)
+function GetClassConstants($className, $prefix = null)
 {
 	$r = new ReflectionClass($className);
-	return $r->getConstants();
+	$constants = $r->getConstants();
+
+	if ($prefix === null)
+	{
+		return $constants;
+	}
+	else
+	{
+		$matchingKeys = preg_grep('!^' . $prefix . '!', array_keys($constants));
+		return array_intersect_key($constants, array_flip($matchingKeys));
+	}
 }
 
 function RandomString($length, $allowedChars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
@@ -128,6 +138,20 @@ function BoolToString(bool $bool)
 	return $bool ? 'true' : 'false';
 }
 
+function ExternalSettingValue(string $value)
+{
+	$tvalue = rtrim($value, "\r\n");
+	$lvalue = strtolower($tvalue);
+	if ($lvalue === "true"){
+		return true;
+	}
+	elseif ($lvalue === "false")
+	{
+		return false;
+	}
+	return $tvalue;
+}
+
 function Setting(string $name, $value)
 {
 	if (!defined('GROCY_' . $name))
@@ -136,11 +160,11 @@ function Setting(string $name, $value)
 		$settingOverrideFile = GROCY_DATAPATH . '/settingoverrides/' . $name . '.txt';
 		if (file_exists($settingOverrideFile))
 		{
-			define('GROCY_' . $name, file_get_contents($settingOverrideFile));
+			define('GROCY_' . $name, ExternalSettingValue(file_get_contents($settingOverrideFile)));
 		}
 		elseif (getenv('GROCY_' . $name) !== false) // An environment variable with the same name and prefix GROCY_ overwrites the given setting
 		{
-			define('GROCY_' . $name, getenv('GROCY_' . $name));
+			define('GROCY_' . $name, ExternalSettingValue(getenv('GROCY_'. $name)));
 		}
 		else
 		{
@@ -163,7 +187,7 @@ function DefaultUserSetting(string $name, $value)
 function GetUserDisplayName($user)
 {
 	$displayName = '';
-	
+
 	if (empty($user->first_name) && !empty($user->last_name))
 	{
 		$displayName = $user->last_name;
@@ -193,3 +217,25 @@ function IsValidFileName($fileName)
 
 	return false;
 }
+
+function IsJsonString($text)
+{
+	json_decode($text);
+	return (json_last_error() == JSON_ERROR_NONE);
+}
+
+function string_starts_with($haystack, $needle)
+{
+	return (substr($haystack, 0, strlen($needle)) === $needle);
+}
+
+function string_ends_with($haystack, $needle)
+{
+	$length = strlen($needle);
+	if ($length == 0)
+	{
+		return true;
+	}
+
+	return (substr($haystack, -$length) === $needle);
+}

localization/chore_assignment_types.pot

@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr ""
+
+msgid "who-least-did-first"
+msgstr ""
+
+msgid "random"
+msgstr ""
+
+msgid "in-alphabetical-order"
+msgstr ""

localization/chore_period_types.pot

@@ -26,3 +26,6 @@ msgstr ""
 
 msgid "monthly"
 msgstr ""
+
+msgid "yearly"
+msgstr ""

localization/component_translations.pot

@@ -29,3 +29,6 @@ msgstr ""
 
 msgid "fullcalendar_locale"
 msgstr ""
+
+msgid "bootstrap-select_locale"
+msgstr ""

localization/cs/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Radim Kabeláč <radim.ekk@gmail.com>, 2020\n"
+"Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "bez-přiřazení"
+
+msgid "who-least-did-first"
+msgstr "poslední-je-první"
+
+msgid "random"
+msgstr "náhodně"
+
+msgid "in-alphabetical-order"
+msgstr "řazení-podle-abecedy"

localization/cs/chore_period_types.po

@@ -0,0 +1,36 @@
+# Translators:
+# Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
+# Michal Petříček <michal@petricek.org>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Michal Petříček <michal@petricek.org>, 2019\n"
+"Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "Manuální"
+
+msgid "dynamic-regular"
+msgstr "Dynamický"
+
+msgid "daily"
+msgstr "Denní"
+
+msgid "weekly"
+msgstr "Týdně"
+
+msgid "monthly"
+msgstr "Měsíčně"
+
+msgid "yearly"
+msgstr "Ročně"

localization/cs/component_translations.po

@@ -0,0 +1,50 @@
+# Translators:
+# Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
+# Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "cs"
+
+msgid "timeago_nan"
+msgstr "před NaN lety"
+
+msgid "moment_locale"
+msgstr "cs"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Tabulka neobsahuje žádná data\",\"sInfo\":\"Zobrazuji "
+"_START_ až _END_ z celkem _TOTAL_ záznamů\",\"sInfoEmpty\":\"Zobrazuji 0 až "
+"0 z 0 záznamů\",\"sInfoFiltered\":\"(filtrováno z celkem _MAX_ "
+"záznamů)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\" "
+"\",\"sLengthMenu\":\"Zobraz záznamů "
+"_MENU_\",\"sLoadingRecords\":\"Načítám...\",\"sProcessing\":\"Provádím...\",\"sSearch\":\"Hledat:\",\"sZeroRecords\":\"Žádné"
+" záznamy nebyly "
+"nalezeny\",\"oPaginate\":{\"sFirst\":\"První\",\"sLast\":\"Poslední\",\"sNext\":\"Další\",\"sPrevious\":\"Předchozí\"},\"oAria\":{\"sSortAscending\":\":"
+" aktivujte pro řazení sloupce vzestupně\",\"sSortDescending\":\": aktivujte "
+"pro řazení sloupce sestupně\"}}"
+
+msgid "summernote_locale"
+msgstr "cs-CZ"
+
+msgid "fullcalendar_locale"
+msgstr "cs"
+
+msgid "bootstrap-select_locale"
+msgstr "cs_CZ"

localization/cs/demo_data.po

@@ -0,0 +1,383 @@
+# Translators:
+# Michal Petříček <michal@petricek.org>, 2019
+# Ondřej Suk <ondra.suk.55@gmail.com>, 2020
+# Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Radim Kabeláč <radim.ekk@gmail.com>, 2020\n"
+"Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Sušenky"
+
+msgid "Chocolate"
+msgstr "Čokoláda"
+
+msgid "Pantry"
+msgstr "Spíž"
+
+msgid "Candy cupboard"
+msgstr "Skříňka s cukrovím"
+
+msgid "Tinned food cupboard"
+msgstr "Skříňka s konzervami"
+
+msgid "Fridge"
+msgstr "Lednička"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Kus"
+msgstr[1] "Kusů"
+msgstr[2] "Kusů"
+msgstr[3] "Kusů"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Balení"
+msgstr[1] "Balení"
+msgstr[2] "Balení"
+msgstr[3] "Balení"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Sklenice"
+msgstr[1] "Sklenic"
+msgstr[2] "Sklenic"
+msgstr[3] "Sklenic"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Plechovka"
+msgstr[1] "Plechovek"
+msgstr[2] "Plechovek"
+msgstr[3] "Plechovek"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Konzerva"
+msgstr[1] "Konzerv"
+msgstr[2] "Konzerv"
+msgstr[3] "Konzerv"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Svazek"
+msgstr[1] "Svazky"
+msgstr[2] "Svazky"
+msgstr[3] "Svazky"
+
+msgid "Gummy bears"
+msgstr "Gumoví medvídci"
+
+msgid "Crisps"
+msgstr "Brambůrky"
+
+msgid "Eggs"
+msgstr "Vajíčka"
+
+msgid "Noodles"
+msgstr "Nudle"
+
+msgid "Pickles"
+msgstr "Kyselé okurky"
+
+msgid "Gulash soup"
+msgstr "Gulášová polévka"
+
+msgid "Yogurt"
+msgstr "Jogurt"
+
+msgid "Cheese"
+msgstr "Sýr"
+
+msgid "Cold cuts"
+msgstr "Uzeniny"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Okurka"
+
+msgid "Radish"
+msgstr "Ředkev"
+
+msgid "Tomato"
+msgstr "Rajče"
+
+msgid "Changed towels in the bathroom"
+msgstr "Vyměněny ručníky v koupeně"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Vytřena podlaha v kuchyni"
+
+msgid "Warranty ends"
+msgstr "Záruka končí"
+
+msgid "TV remote control"
+msgstr "Dálkový ovladač k TV"
+
+msgid "Alarm clock"
+msgstr "Budík"
+
+msgid "Heat remote control"
+msgstr "Dálkové ovládání k topení"
+
+msgid "Lawn mowed in the garden"
+msgstr "Posekán trávník na zahradě"
+
+msgid "Some good snacks"
+msgstr "Nějaké dobroty"
+
+msgid "Pizza dough"
+msgstr "Těsto na pizzu"
+
+msgid "Sieved tomatoes"
+msgstr "Drcená rajčata"
+
+msgid "Salami"
+msgstr "Salám"
+
+msgid "Toast"
+msgstr "Toast"
+
+msgid "Minced meat"
+msgstr "Mleté maso"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Boloňské špagety"
+
+msgid "Sandwiches"
+msgstr "Sendviče"
+
+msgid "English"
+msgstr "Angličtina"
+
+msgid "German"
+msgstr "Němčina"
+
+msgid "Italian"
+msgstr "Italština"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Toto je poznámka u suroviny receptu"
+
+msgid "Demo User"
+msgstr "Demo uživatel"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gram"
+msgstr[1] "Gramů"
+msgstr[2] "Gramů"
+msgstr[3] "Gramů"
+
+msgid "Flour"
+msgstr "Mouka"
+
+msgid "Pancakes"
+msgstr "Palačinky"
+
+msgid "Sugar"
+msgstr "Cukr"
+
+msgid "Home"
+msgstr "Domov"
+
+msgid "Life"
+msgstr "Život"
+
+msgid "Projects"
+msgstr "Projekty"
+
+msgid "Repair the garage door"
+msgstr "Opravit garážová vrata"
+
+msgid "Fork and improve grocy"
+msgstr "Forknout a vylepšit grocy"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Najít řešení situace, když si zapomenu klíče od domova"
+
+msgid "Sweets"
+msgstr "Sladkosti"
+
+msgid "Bakery products"
+msgstr "Pečivo"
+
+msgid "Tinned food"
+msgstr "Konzervované potraviny"
+
+msgid "Butchery products"
+msgstr "Maso a uzeniny"
+
+msgid "Vegetables/Fruits"
+msgstr "Ovoce a zelenina"
+
+msgid "Refrigerated products"
+msgstr "Chlazené potraviny"
+
+msgid "Coffee machine"
+msgstr "Kávovar"
+
+msgid "Dishwasher"
+msgstr "Myčka nádobí"
+
+msgid "Liter"
+msgstr "Litr"
+
+msgid "Liters"
+msgstr "Litry"
+
+msgid "Bottle"
+msgstr "Láhev"
+
+msgid "Bottles"
+msgstr "Láhve"
+
+msgid "Milk"
+msgstr "Mléko"
+
+msgid "Chocolate sauce"
+msgstr "Čokoládová poleva"
+
+msgid "Milliliters"
+msgstr "Mililitry"
+
+msgid "Milliliter"
+msgstr "Mililitr"
+
+msgid "Bottom"
+msgstr "Dno"
+
+msgid "Topping"
+msgstr "Poleva"
+
+msgid "French"
+msgstr "Francouzština"
+
+msgid "Turkish"
+msgstr "Turečtina"
+
+msgid "Spanish"
+msgstr "Španělština"
+
+msgid "Russian"
+msgstr "Ruština"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "Událost opakující se 5. den každý měsíc"
+
+msgid "The thing which happens daily"
+msgstr "Událost opakující se každý den"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "Událost opakující se každé pondělí a středu"
+
+msgid "Swedish"
+msgstr "Švédština"
+
+msgid "Polish"
+msgstr "Polština"
+
+msgid "Milk Chocolate"
+msgstr "Mléčná čokoláda"
+
+msgid "Dark Chocolate"
+msgstr "Hořká čokoláda"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Plátek"
+msgstr[1] "Plátky"
+msgstr[2] "Plátky"
+msgstr[3] "Plátky"
+
+msgid "Example userentity"
+msgstr "Příklad uživatelské entity"
+
+msgid "This is an example user entity..."
+msgstr "Toto je ukázková položka uživatelské entity"
+
+msgid "Custom field"
+msgstr "Vlastní pole"
+
+msgid "Example field value..."
+msgstr "Příklad hodnoty pole..."
+
+msgid "Waffle rolls"
+msgstr "Oplatky"
+
+msgid "Danish"
+msgstr "Dánština"
+
+msgid "Dutch"
+msgstr "Holandština"
+
+msgid "Norwegian"
+msgstr "Norština"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabilní verze"
+
+msgid "Preview version"
+msgstr "Preview verze"
+
+msgid "current release"
+msgstr "aktuální vydání"
+
+msgid "not yet released"
+msgstr "zatím nevydáno"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugalština (Brazílie)"
+
+msgid "This is a note"
+msgstr "Toto je poznámka"
+
+msgid "Freezer"
+msgstr "Mrazák"
+
+msgid "Hungarian"
+msgstr "Maďarština"
+
+msgid "Slovak"
+msgstr "Slovenština"
+
+msgid "Czech"
+msgstr ""
+
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr ""
+
+msgid "Japanese"
+msgstr ""
+
+msgid "Chinese (Taiwan)"
+msgstr ""

localization/cs/userfield_types.po

@@ -0,0 +1,48 @@
+# Translators:
+# Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
+# Michal Franc, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Michal Franc, 2020\n"
+"Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "Text (jeden řádek)"
+
+msgid "text-multi-line"
+msgstr "Text (více řádků)"
+
+msgid "number-integral"
+msgstr "Celé číslo"
+
+msgid "number-decimal"
+msgstr "Číslo s desetinami"
+
+msgid "date"
+msgstr "Datum"
+
+msgid "datetime"
+msgstr "Datum a čas"
+
+msgid "checkbox"
+msgstr "Zaškrtávací políčko"
+
+msgid "preset-list"
+msgstr "Seznam"
+
+msgid "preset-checklist"
+msgstr "Zaškrtávací seznam"
+
+msgid "link"
+msgstr "Odkaz"

localization/da/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Troels Siggaard <troels@siggaard.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "ingen-tildeling"
+
+msgid "who-least-did-first"
+msgstr "hvem-mindst-gjorde-først"
+
+msgid "random"
+msgstr "tilfældig"
+
+msgid "in-alphabetical-order"
+msgstr "i-alfabetisk-rækkefølge"

localization/da/chore_period_types.po

@@ -1,5 +1,7 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,16 +19,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Manuelt"
+msgstr "manuelt"
 
 msgid "dynamic-regular"
-msgstr ""
+msgstr "dynamisk-regelmæssig"
 
 msgid "daily"
-msgstr ""
+msgstr "daglig"
 
 msgid "weekly"
-msgstr ""
+msgstr "ugentlig"
 
 msgid "monthly"
-msgstr ""
+msgstr "månedlig"
+
+msgid "yearly"
+msgstr "årlig"

localization/da/component_translations.po

@@ -1,3 +1,5 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,19 +17,39 @@ msgstr ""
 "X-Domain: grocy/component_translations\n"
 
 msgid "timeago_locale"
-msgstr ""
+msgstr "da"
 
 msgid "timeago_nan"
-msgstr ""
+msgstr "for NaN år"
 
 msgid "moment_locale"
-msgstr ""
+msgstr "da"
 
 msgid "datatables_localization"
 msgstr ""
+"{\n"
+"\"sProcessing\": \"Henter...\",\n"
+"\"sLengthMenu\": \"Vis _MENU_ linjer\",\n"
+"\"sZeroRecords\": \"Ingen linjer matcher s&oslash;gningen\",\n"
+"\"sInfo\": \"Viser _START_ til _END_ af _TOTAL_ linjer\",\n"
+"\"sInfoEmpty\": \"Viser 0 til 0 af 0 linjer\",\n"
+"\"sInfoFiltered\": \"(filtreret fra _MAX_ linjer)\",\n"
+"\"sInfoPostFix\": \"\",\n"
+"\"sSearch\": \"S&oslash;g:\",\n"
+"\"sUrl\": \"\",\n"
+"\"oPaginate\": {\n"
+"\"sFirst\": \"F&oslash;rste\",\n"
+"\"sPrevious\": \"Forrige\",\n"
+"\"sNext\": \"N&aelig;ste\",\n"
+"\"sLast\": \"Sidste\"\n"
+"}\n"
+"}"
 
 msgid "summernote_locale"
-msgstr ""
+msgstr "da-DK"
 
 msgid "fullcalendar_locale"
-msgstr ""
+msgstr "da"
+
+msgid "bootstrap-select_locale"
+msgstr "da_DK"

localization/da/demo_data.po

@@ -1,5 +1,8 @@
 # Translators:
 # dark159123 <r.j.hansen@protonmail.com>, 2019
+# Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: dark159123 <r.j.hansen@protonmail.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,13 +23,13 @@ msgid "Cookies"
 msgstr "Småkager"
 
 msgid "Chocolate"
-msgstr "chokolade"
+msgstr "Chokolade"
 
 msgid "Pantry"
 msgstr "Spisekammer"
 
 msgid "Candy cupboard"
-msgstr "Slik skuffe"
+msgstr "Slikskuffe"
 
 msgid "Tinned food cupboard"
 msgstr "Dåsemadsskab"
@@ -36,36 +39,36 @@ msgstr "Køleskab"
 
 msgid "Piece"
 msgid_plural "Pieces"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "stk"
+msgstr[1] "stk"
 
 msgid "Pack"
 msgid_plural "Packs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakke"
+msgstr[1] "Pakker"
 
 msgid "Glass"
 msgid_plural "Glasses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Glas"
+msgstr[1] "Glas"
 
 msgid "Tin"
 msgid_plural "Tins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dåse"
+msgstr[1] "Dåser"
 
 msgid "Can"
 msgid_plural "Cans"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dåse"
+msgstr[1] "Dåser"
 
 msgid "Bunch"
 msgid_plural "Bunches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Klase"
+msgstr[1] "Klaser"
 
 msgid "Gummy bears"
-msgstr "Vingummi bamser"
+msgstr "Vingummibamser"
 
 msgid "Crisps"
 msgstr "Chips"
@@ -80,7 +83,7 @@ msgid "Pickles"
 msgstr "Syltede agurker"
 
 msgid "Gulash soup"
-msgstr "Gulash"
+msgstr "Gullashsuppe"
 
 msgid "Yogurt"
 msgstr "Yoghurt"
@@ -113,22 +116,22 @@ msgid "Warranty ends"
 msgstr "Reklamationsret udløber"
 
 msgid "TV remote control"
-msgstr "Fjernbetjening"
+msgstr "Fjernbetjening til TV'et"
 
 msgid "Alarm clock"
-msgstr "Vægge ur"
+msgstr "Væggeur"
 
 msgid "Heat remote control"
-msgstr "Varmefjernbetjening"
+msgstr "Fjernbetjening til varme"
 
 msgid "Lawn mowed in the garden"
-msgstr "Græs slået"
+msgstr "Græsset blev slået i haven"
 
 msgid "Some good snacks"
 msgstr "Nogle gode snacks"
 
 msgid "Pizza dough"
-msgstr "Pizza dej"
+msgstr "Pizzadej"
 
 msgid "Sieved tomatoes"
 msgstr "Sigtede tomater"
@@ -149,7 +152,7 @@ msgid "Spaghetti bolognese"
 msgstr "Spaghetti bolognese"
 
 msgid "Sandwiches"
-msgstr "Sandwiches"
+msgstr "Sandwich"
 
 msgid "English"
 msgstr "Engelsk"
@@ -158,21 +161,18 @@ msgid "German"
 msgstr "Tysk"
 
 msgid "Italian"
-msgstr "Italiænsk"
-
-msgid "Demo in different language"
-msgstr "Demo i et andet sprog"
+msgstr "Italiensk"
 
 msgid "This is the note content of the recipe ingredient"
-msgstr "Dette er indholdet af opskrift ingrediensens notefelt"
+msgstr "Dette er indholdet af opskrift-ingrediensens notefeltet"
 
 msgid "Demo User"
-msgstr "Demo Bruger"
+msgstr "Demobruger"
 
 msgid "Gram"
 msgid_plural "Grams"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gram"
+msgstr[1] "Gram"
 
 msgid "Flour"
 msgstr "Mel"
@@ -187,25 +187,25 @@ msgid "Home"
 msgstr "Hjem"
 
 msgid "Life"
-msgstr "Liv"
+msgstr "Livet"
 
 msgid "Projects"
 msgstr "Projekter"
 
 msgid "Repair the garage door"
-msgstr "Reparér garagedøren"
+msgstr "Reparer garagedøren"
 
 msgid "Fork and improve grocy"
 msgstr "Fork og forbedre grocy"
 
 msgid "Find a solution for what to do when I forget the door keys"
-msgstr "Find en løsning for når jeg glemmer husnøglen"
+msgstr "Find en løsning på hvad jeg gør, når jeg glemmer nøglen til huset"
 
 msgid "Sweets"
 msgstr "Slik"
 
 msgid "Bakery products"
-msgstr "Bageriprodukter"
+msgstr "Bagværk"
 
 msgid "Tinned food"
 msgstr "Dåsemad"
@@ -217,13 +217,13 @@ msgid "Vegetables/Fruits"
 msgstr "Frugt og grønt"
 
 msgid "Refrigerated products"
-msgstr "Nedkølede produkter"
+msgstr "Køleskabsvarer"
 
 msgid "Coffee machine"
 msgstr "Kaffemaskine"
 
 msgid "Dishwasher"
-msgstr "Opvasker"
+msgstr "Opvaskemaskine"
 
 msgid "Liter"
 msgstr "Liter"
@@ -259,25 +259,110 @@ msgid "French"
 msgstr "Fransk"
 
 msgid "Turkish"
-msgstr ""
+msgstr "Tyrkisk"
 
 msgid "Spanish"
-msgstr ""
+msgstr "Spansk"
 
 msgid "Russian"
-msgstr ""
+msgstr "Russisk"
 
 msgid "The thing which happens on the 5th of every month"
-msgstr ""
+msgstr "Det der sker hver den 5. i måneden"
 
 msgid "The thing which happens daily"
-msgstr ""
+msgstr "Det der sker dagligt"
 
 msgid "The thing which happens on Mondays and Wednesdays"
-msgstr ""
+msgstr "Det der sker på mandage og onsdage"
 
 msgid "Swedish"
-msgstr ""
+msgstr "Svensk"
 
 msgid "Polish"
+msgstr "Polsk"
+
+msgid "Milk Chocolate"
+msgstr "Mælkechokolade"
+
+msgid "Dark Chocolate"
+msgstr "Mørk chokolade"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Skive"
+msgstr[1] "Skiver"
+
+msgid "Example userentity"
+msgstr "Eksempel-brugerenhed"
+
+msgid "This is an example user entity..."
+msgstr "Dette er en eksempel-brugerenhed..."
+
+msgid "Custom field"
+msgstr "Brugerdefineret felt"
+
+msgid "Example field value..."
+msgstr "Eksempel-feltværdi..."
+
+msgid "Waffle rolls"
+msgstr "Vaffelruller"
+
+msgid "Danish"
+msgstr "Dansk"
+
+msgid "Dutch"
+msgstr "Hollandsk"
+
+msgid "Norwegian"
+msgstr "Norsk"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil version"
+
+msgid "Preview version"
+msgstr "Forhåndsvisningsversion"
+
+msgid "current release"
+msgstr "aktuel udgivelse"
+
+msgid "not yet released"
+msgstr "Ikke frigivet endnu"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasilien)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""
+
+msgid "Czech"
+msgstr ""
+
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr ""
+
+msgid "Japanese"
+msgstr ""
+
+msgid "Chinese (Taiwan)"
 msgstr ""

localization/da/stock_transaction_types.po

@@ -1,5 +1,6 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Troels Siggaard <troels@siggaard.com>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +18,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr "Køb"
+msgstr "køb"
+
+msgid "transfer_from"
+msgstr "flyt_fra"
+
+msgid "transfer_to"
+msgstr "flyt_til"
 
 msgid "consume"
-msgstr "Brug"
+msgstr "forbrug"
 
 msgid "inventory-correction"
-msgstr "Beholdningsrettelse"
+msgstr "beholdningsrettelse"
 
 msgid "product-opened"
-msgstr "Produkt åbnet"
+msgstr "produkt-åbnet"
+
+msgid "stock-edit-old"
+msgstr "lager-redigering-gammel"
+
+msgid "stock-edit-new"
+msgstr "lager-redigering-ny"
+
+msgid "self-production"
+msgstr ""

localization/da/userfield_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,22 +17,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr ""
+msgstr "tekst-enkelt-linje"
 
 msgid "text-multi-line"
-msgstr ""
+msgstr "tekst-flere-linjer"
 
 msgid "number-integral"
-msgstr ""
+msgstr "tal-heltal"
 
 msgid "number-decimal"
-msgstr ""
+msgstr "tal-decimal"
 
 msgid "date"
-msgstr ""
+msgstr "dato"
 
 msgid "datetime"
-msgstr ""
+msgstr "datotid"
 
 msgid "checkbox"
-msgstr ""
+msgstr "afkrydsningsfelt"
+
+msgid "preset-list"
+msgstr "forudindstillet-liste"
+
+msgid "preset-checklist"
+msgstr "forudindstillet-tjekliste"
+
+msgid "link"
+msgstr "link"

localization/de/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "Niemandem zuweisen"
+
+msgid "who-least-did-first"
+msgstr "Wer es am seltensten gemacht hat zuerst"
+
+msgid "random"
+msgstr "Zufällig"
+
+msgid "in-alphabetical-order"
+msgstr "In alphabetischer Reihenfolge"

localization/de/chore_period_types.po

@@ -30,3 +30,6 @@ msgstr "Wöchentlich"
 
 msgid "monthly"
 msgstr "Monatlich"
+
+msgid "yearly"
+msgstr "Jährlich"

localization/de/component_translations.po

@@ -52,3 +52,6 @@ msgstr "de-DE"
 
 msgid "fullcalendar_locale"
 msgstr "de"
+
+msgid "bootstrap-select_locale"
+msgstr "de_DE"

localization/de/demo_data.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,9 +160,6 @@ msgstr "Deutsch"
 msgid "Italian"
 msgstr "Italienisch"
 
-msgid "Demo in different language"
-msgstr "Demo in anderer Sprache"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Dies ist der Inhalt der Notiz der Zutat"
 
@@ -281,3 +278,88 @@ msgstr "Schwedisch"
 
 msgid "Polish"
 msgstr "Polnisch"
+
+msgid "Milk Chocolate"
+msgstr "Milchschokolade"
+
+msgid "Dark Chocolate"
+msgstr "Zartbitterschokolade"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Scheibe"
+msgstr[1] "Scheiben"
+
+msgid "Example userentity"
+msgstr "Beispiel Benutzerentität"
+
+msgid "This is an example user entity..."
+msgstr "Dies ist eine Beispiel-Benutzerentität"
+
+msgid "Custom field"
+msgstr "Benutzerdefiniertes Feld"
+
+msgid "Example field value..."
+msgstr "Beispiel Feldwert..."
+
+msgid "Waffle rolls"
+msgstr "Waffelröllchen"
+
+msgid "Danish"
+msgstr "Dänisch"
+
+msgid "Dutch"
+msgstr "Niederländisch"
+
+msgid "Norwegian"
+msgstr "Norwegisch"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabile Version"
+
+msgid "Preview version"
+msgstr "Vorschauversion"
+
+msgid "current release"
+msgstr "aktuelles Release"
+
+msgid "not yet released"
+msgstr "noch nicht freigegeben"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugiesisch (Brasilien)"
+
+msgid "This is a note"
+msgstr "Dies ist eine Notiz"
+
+msgid "Freezer"
+msgstr "Gefrierschrank"
+
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+msgid "Slovak"
+msgstr "Slowakisch"
+
+msgid "Czech"
+msgstr "Tschechisch"
+
+msgid "Portuguese (Portugal)"
+msgstr "Portugiesisch (Portugal)"
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr "Aldi"
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr "Rewe"
+
+msgid "Japanese"
+msgstr "Japanisch"
+
+msgid "Chinese (Taiwan)"
+msgstr "Chinesisch (Taiwan)"

localization/de/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Einkauf"
 
+msgid "transfer_from"
+msgstr "Umlagerung von"
+
+msgid "transfer_to"
+msgstr "Umlagerung nach"
+
 msgid "consume"
 msgstr "Verbrauch"
 
@@ -27,3 +33,12 @@ msgstr "Inventur-Korrektur"
 
 msgid "product-opened"
 msgstr "Produkt geöffnet"
+
+msgid "stock-edit-old"
+msgstr "Bestandseintrag bearbeitet (alte Werte)"
+
+msgid "stock-edit-new"
+msgstr "Bestandseintrag bearbeitet (neue Werte)"
+
+msgid "self-production"
+msgstr "Eigenproduktion"

localization/de/strings.po

@@ -1,5 +1,6 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Hagen Tasche <github@fvbor.de>, 2020
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +76,7 @@ msgid "Shopping list"
 msgstr "Einkaufszettel"
 
 msgid "Chore tracking"
-msgstr "Hausarbeiten-Ausführung"
+msgstr "Hausarbeit-Ausführung"
 
 msgid "Battery tracking"
 msgstr "Batterie-Ladezyklus"
@@ -83,6 +84,9 @@ msgstr "Batterie-Ladezyklus"
 msgid "Locations"
 msgstr "Standorte"
 
+msgid "Stores"
+msgstr "Geschäfte"
+
 msgid "Quantity units"
 msgstr "Mengeneinheiten"
 
@@ -129,7 +133,7 @@ msgid "Last purchased"
 msgstr "Zuletzt gekauft"
 
 msgid "Last used"
-msgstr "Zuletzt benutzt"
+msgstr "Zuletzt verbraucht"
 
 msgid "Spoiled"
 msgstr "Verdorben"
@@ -221,6 +225,9 @@ msgstr "Faktor Mengeneinheit Einkauf zu Mengeneinheit Bestand"
 msgid "Create location"
 msgstr "Standort erstellen"
 
+msgid "Create store"
+msgstr "Geschäft erstellen"
+
 msgid "Create quantity unit"
 msgstr "Mengeneinheit erstellen"
 
@@ -254,6 +261,9 @@ msgstr "Produkt bearbeiten"
 msgid "Edit location"
 msgstr "Standort bearbeiten"
 
+msgid "Edit store"
+msgstr "Geschäft bearbeiten"
+
 msgid "Record data"
 msgstr "Daten erfassen"
 
@@ -330,6 +340,9 @@ msgstr "Produkt \"%s\" wirklich löschen?"
 msgid "Are you sure to delete location \"%s\"?"
 msgstr "Standort \"%s\" wirklich löschen?"
 
+msgid "Are you sure to delete store \"%s\"?"
+msgstr "Geschäft \"%s\" wirklich löschen?"
+
 msgid "Manage API keys"
 msgstr "API-Keys verwalten"
 
@@ -361,8 +374,8 @@ msgid "This means %s will be removed from stock"
 msgstr "Das bedeutet %s wird aus dem Bestand entfernt"
 
 msgid ""
-"This means it is estimated that a new execution of this chore is tracked %s "
-"days after the last was tracked"
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
 msgstr ""
 "Das bedeutet, dass eine erneute Ausführung der Hausarbeit %s Tage nach der "
 "letzten Ausführung geplant wird"
@@ -676,7 +689,7 @@ msgstr ""
 msgid "Consume all ingredients needed by this recipe"
 msgstr ""
 "Alle Zutaten, die von diesem Rezept benötigt werden, aus dem Bestand "
-"enternen"
+"entfernen"
 
 msgid "Click to show technical details"
 msgstr "Klick um technische Details anzuzeigen"
@@ -847,16 +860,16 @@ msgid "Instruction manual"
 msgstr "Bedienungsanleitung"
 
 msgid "The selected equipment has no instruction manual"
-msgstr "Das ausgewählte Gerät hat keine Bedienungsanleitung"
+msgstr "Die ausgewählte Ausstattung hat keine Bedienungsanleitung"
 
 msgid "Notes"
 msgstr "Notizen"
 
 msgid "Edit equipment"
-msgstr "Geräte bearbeiten"
+msgstr "Ausstattung bearbeiten"
 
 msgid "Create equipment"
-msgstr "Geräte erstellen"
+msgstr "Ausstattung erstellen"
 
 msgid ""
 "If you don't select a file, the current instruction manual will not be "
@@ -871,7 +884,8 @@ msgstr "Keine Bedienungsanleitung vorhanden"
 msgid ""
 "The current instruction manual will be deleted when you save the equipment"
 msgstr ""
-"Die aktuelle Bedienungsanleitung wird beim Speichern des Geräts gelöscht"
+"Die aktuelle Bedienungsanleitung wird beim Speichern der Ausstattung "
+"gelöscht"
 
 msgid "No picture available"
 msgstr "Kein Bild vorhanden"
@@ -974,12 +988,12 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "%1$s %2$s als geöffnet markieren"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Wenn ein Produkt als geöffnet markiert wurde, wird das "
+"Wenn dieses Produkt als geöffnet markiert wurde, wird das "
 "Mindesthaltbarkeitsdatum durch heute + diese Anzahl von Tagen ersetzt (ein "
-"Wert von 0 deaktiviert dies)"
+"Wert von 0 deaktiviert dies) "
 
 msgid "Default best before days after opened"
 msgstr "Standard Haltbarkeit in Tagen nach dem Öffnen"
@@ -990,9 +1004,6 @@ msgstr "%1$s %2$s als geöffnet markiert"
 msgid "Mark as opened"
 msgstr "Als geöffnet markieren"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Läuft ab am %1$s; Gekauft am %2$s"
-
 msgid "Not opened"
 msgstr "Nicht geöffnet"
 
@@ -1018,7 +1029,7 @@ msgid "Show clock in header"
 msgstr "Uhr in der Kopfzeile anzeigen"
 
 msgid "Stock settings"
-msgstr "Bestandseinstellungen"
+msgstr "Bestand-Einstellungen"
 
 msgid "Shopping list to stock workflow"
 msgstr "Einkaufsliste -> Bestand Workflow"
@@ -1117,6 +1128,9 @@ msgstr ""
 msgid "You have to select a location"
 msgstr "Ein Standort muss ausgewählt werden"
 
+msgid "You have to select a store"
+msgstr "Ein Geschäft muss ausgewählt werden"
+
 msgid "List"
 msgstr "Liste"
 
@@ -1150,7 +1164,7 @@ msgstr "Systeminformationen"
 msgid "Changelog"
 msgstr "Änderungsprotokoll"
 
-msgid "will be multiplied a factor of %1$s to get %2$s"
+msgid "will be multiplied by a factor of %1$s to get %2$s"
 msgstr "wird mit dem Faktor %1$s multipliziert um %2$s zu erhalten"
 
 msgid "The given date is earlier than today, are you sure?"
@@ -1308,6 +1322,9 @@ msgstr "Nicht ausreichend im Bestand"
 msgid "Expiring soon days"
 msgstr "\"Bald ablaufend\"-Tage"
 
+msgid "Default location"
+msgstr "Standard Standort"
+
 msgid "Default amount for purchase"
 msgstr "Standardmenge für Einkauf"
 
@@ -1338,8 +1355,8 @@ msgstr "Verbrauche %1$s %2$s"
 msgid "Meal plan"
 msgstr "Speiseplan"
 
-msgid "Add recipe to %s"
-msgstr "Rezept zu %s hinzufügen"
+msgid "Add recipe on %s"
+msgstr "Rezept am %s hinzufügen"
 
 msgid "%s serving"
 msgid_plural "%s servings"
@@ -1394,3 +1411,595 @@ msgstr ""
 
 msgid "Undo task \"%s\""
 msgstr "Aufgabe \"%s\" rückgängig machen"
+
+msgid "Due date rollover"
+msgstr "Fälligkeit hinausschieben"
+
+msgid ""
+"When enabled the chore can never be overdue, the due date will shift forward"
+" each day when due"
+msgstr ""
+"Wenn gewählt, kann die Hausarbeit nie überfällig werden - das "
+"Fälligkeitsdatum wird jeden Tag ab Fälligkeit einen Tag vorgeschoben"
+
+msgid "Location Content Sheet"
+msgstr "Standort-Inhaltsblatt"
+
+msgid "Print"
+msgstr "Drucken"
+
+msgid "all locations"
+msgstr "alle Standorte"
+
+msgid ""
+"Here you can print a page per location with the current stock, maybe to hang"
+" it there and note the consumed things on it."
+msgstr ""
+"Hier kannst du eine Seite pro Standort mit dem aktuellen Bestand drucken, "
+"gedacht um diese am entsprechenden Platz aufzuhängen, damit die verbauchten "
+"Dinge darauf vermerkt werden können."
+
+msgid "this location"
+msgstr "diesen Standort"
+
+msgid "Consumend amount"
+msgstr "Verbrauchte Menge"
+
+msgid "Time of printing"
+msgstr "Druckzeitpunkt"
+
+msgid "Are you sure to delete equipment \"%s\"?"
+msgstr "Ausstattung \"%s\" wirklich löschen?"
+
+msgid "Parent product"
+msgstr "Übergeordnetes Produkt"
+
+msgid ""
+"Not possible because this product is already used as a parent product in "
+"another product"
+msgstr ""
+"Nicht möglich, da dieses Produkt bereits als übergeordnetes Produkt eines "
+"anderen Produkts verwendet wird"
+
+msgid "Default conversions"
+msgstr "Standardumrechnungen"
+
+msgid "Factor"
+msgstr "Faktor"
+
+msgid "1 %s is the same as..."
+msgstr "1 %s ist identisch mit..."
+
+msgid "Create QU conversion"
+msgstr "ME-Umrechnung erstellen"
+
+msgid "Default for QU"
+msgstr "Standard für ME"
+
+msgid "Quantity unit from"
+msgstr "ME von"
+
+msgid "Quantity unit to"
+msgstr "ME nach"
+
+msgid ""
+"This cannot be lower than %1$s and must be a valid number with max. %2$s "
+"decimal places"
+msgstr ""
+"Diese darf nicht niedriger sein als %1$s und muss eine gültige Zahl mit max."
+" %2$s Nachkommastellen sein"
+
+msgid "This cannot be equal to %s"
+msgstr "Dies darf nicht gleich sein wie %s"
+
+msgid "This means 1 %1$s is the same as %2$s %3$s"
+msgstr "Das bedeutet 1 %1$s entsprechen %2$s %3$s"
+
+msgid "QU conversions"
+msgstr "ME-Umrechnungen"
+
+msgid "Product overrides"
+msgstr "Produktübersteuerung"
+
+msgid "Override for product"
+msgstr "Übersteuerung für Produkt"
+
+msgid "This equals %1$s %2$s in stock"
+msgstr "Dies entspricht %1$s %2$s im Bestand"
+
+msgid "Edit QU conversion"
+msgstr "ME-Umrechnung bearbeiten"
+
+msgid "An assignment type is required"
+msgstr "Ein Zuweisungstyp ist erforderlich"
+
+msgid "Assignment type"
+msgstr "Zuweisungstyp"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 day after the "
+"last execution"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Tage nach der "
+"letzten Ausführung geplant wird"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 day after the "
+"last execution, but only for the weekdays selected below"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Tage nach der "
+"letzten Ausführung geplant wird, aber nur für unten ausgewählten Wochentage"
+
+msgid "This means the next execution of this chore is not scheduled"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nicht geplant wird"
+
+msgid ""
+"This means the next execution of this chore is scheduled on the below "
+"selected day of each month"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit jeden Monat an dem"
+" unten ausgewählt Tag geplant wird"
+
+msgid ""
+"This means the next execution of this chore will not be assigned to anyone"
+msgstr ""
+"Das bedeutet, dass die nächste Ausführung der Hausarbeit niemandem "
+"zugewiesen wird"
+
+msgid ""
+"This means the next execution of this chore will be assigned to the one who "
+"executed it least"
+msgstr ""
+"Das bedeutet, dass die nächste Ausführung der Hausarbeit demjenigen "
+"zugewiesen wird, der diese am wenigsten häufig ausgeführt hat"
+
+msgid "This means the next execution of this chore will be assigned randomly"
+msgstr ""
+"Das bedeutet, dass die nächste Ausführung der Hausarbeit zufällig jemanden "
+"zugewiesen wird"
+
+msgid ""
+"This means the next execution of this chore will be assigned to the next one"
+" in alphabetical order"
+msgstr ""
+"Das bedeutet, dass die nächste Ausführung der Hausarbeit dem nächsten in "
+"alphabetischer Reihenfolge zugewiesen wird"
+
+msgid "Assign to"
+msgstr "Zuweisen an"
+
+msgid "This assignment type requires that at least one is assigned"
+msgstr ""
+"Diese Zuordnungsart setzt voraus, dass mindestens eine Person zugeordnet ist"
+
+msgid "%s chore is assigned to me"
+msgid_plural "%s chores are assigned to me"
+msgstr[0] "%s ist mir zugewiesen"
+msgstr[1] "%s Hausarbeiten sind mir zugewiesen"
+
+msgid "Assigned to me"
+msgstr "Mir zugewiesen"
+
+msgid "assigned to %s"
+msgstr "zugewiesen an %s"
+
+msgid "Filter by assignment"
+msgstr "Nach Zuweisung filtern"
+
+msgid "Consume product on chore execution"
+msgstr "Ein Produkt bei Hausarbeit-Ausführung verbrauchen"
+
+msgid "Are you sure to delete user field \"%s\"?"
+msgstr "Benutzerfeld \"%s\" wirklich löschen?"
+
+msgid "Userentities"
+msgstr "Benutzerentitäten"
+
+msgid "Create userentity"
+msgstr "Benutzerentität erstellen"
+
+msgid "Show in sidebar menu"
+msgstr "Im Seitenleisten-Menü anzeigen"
+
+msgid "Edit userentity"
+msgstr "Benutzerentität bearbeiten"
+
+msgid "Edit %s"
+msgstr "%s bearbeiten"
+
+msgid "Create %s"
+msgstr "%s erstellen"
+
+msgid "Are you sure to delete this userobject?"
+msgstr "Dieses Benutzerobject wirklich löschen?"
+
+msgid "Icon CSS class"
+msgstr "Icon CSS-Klasse"
+
+msgid "For example"
+msgstr "Zum Beispiel"
+
+msgid "Configure fields"
+msgstr "Felder konfigurieren"
+
+msgid "Quantity unit plural form testing"
+msgstr "ME Pluralformen testen"
+
+msgid "Result"
+msgstr "Ergebnis"
+
+msgid "Test plural forms"
+msgstr "Pluralformen testen"
+
+msgid "Scan a barcode"
+msgstr "Scanne einen Barcode"
+
+msgid "Error while initializing the barcode scanning library"
+msgstr "Fehler beim Initialisieren der Barcode-Scan-Komponenten"
+
+msgid ""
+"The resulting price of this ingredient will be multiplied by this factor"
+msgstr ""
+"Der resultierende Preis dieser Zutat wird mit diesem Faktor multipliziert"
+
+msgid "Price factor"
+msgstr "Preisfaktor"
+
+msgid "Do you find grocy useful?"
+msgstr "Findest du grocy nützlich?"
+
+msgid "Say thanks"
+msgstr "Sag Danke"
+
+msgid "Search for recipes containing this product"
+msgstr "Suche nach Rezepten, die dieses Produkt enthalten"
+
+msgid "Add to shopping list"
+msgstr "Zum Einkaufszettel hinzufügen"
+
+msgid "Added %1$s of %2$s to the shopping list \"%3$s\""
+msgstr "%1$s %2$s dem Einkauszettel \"%3$s\" hinzugefügt"
+
+msgid "Output"
+msgstr "Ausgabe"
+
+msgid "Energy (kcal)"
+msgstr "Energie (kcal)"
+
+msgid "Per stock quantity unit"
+msgstr "Pro Bestandsmengeneinheit"
+
+msgid "Barcode scanner testing"
+msgstr "Barcodescanner testen"
+
+msgid "Expected barcode"
+msgstr "Erwarteter Barcode"
+
+msgid "Scan field"
+msgstr "Scanfeld"
+
+msgid "Scanned barcodes"
+msgstr "Gescannte Barcodes"
+
+msgid "Hit"
+msgstr "Erfolgreich"
+
+msgid "Miss"
+msgstr "Fehler"
+
+msgid "Display recipe"
+msgstr "Rezept anzeigen"
+
+msgid "Accumulate sub products min. stock amount"
+msgstr "Mindestbestände von untergeordneten Produkten aufsummieren"
+
+msgid ""
+"If enabled, the min. stock amount of sub products will be accumulated into "
+"this product, means the sub product will never be \"missing\", only this "
+"product"
+msgstr ""
+"Wenn aktiviert, werden die Mindestbestände von untergeordneten Produkten "
+"aufsummiert, heißt das untergeordnete Produkt wird nie \"fehlen\", nur "
+"dieses"
+
+msgid "Are you sure to remove this conversion?"
+msgstr "Diese Umrechnung wirklich löschen?"
+
+msgid "Unit price"
+msgstr "Einzelpreis"
+
+msgid "Total price"
+msgstr "Gesamtpreis"
+
+msgid "in %s and based on the purchase quantity unit"
+msgstr "In %s und bezogen auf die Einkaufsmengeneinheit"
+
+msgid "Unlimited"
+msgstr "Unbegrenzt"
+
+msgid "Clear"
+msgstr "Löschen"
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr "Das enthaltene Rezept \"%s\" wirklich löschen?"
+
+msgid "Period interval"
+msgstr "Periodenintervall"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Tage "
+"geplant wird"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Wochen"
+" geplant wird"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Monate"
+" geplant wird"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Jahr nach der "
+"letzten Ausführung geplant wird"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Jahre "
+"geplant wird"
+
+msgid "Transfer"
+msgstr "Umlagern"
+
+msgid "From location"
+msgstr "Von Standort"
+
+msgid "To location"
+msgstr "Nach Standort"
+
+msgid "There are no units available at this location"
+msgstr "Keine Einheiten an diesem Standort verfügbar"
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Menge: %1$s; Läuft ab am %2$s; Gekauft am %3$s "
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "%1$s %2$s von %3$s nach %4$s verschoben"
+
+msgid "Show stock entries"
+msgstr "Bestandseinträge anzeigen"
+
+msgid "Stock entries"
+msgstr "Bestandseinträge"
+
+msgid "Best before date"
+msgstr "MHD"
+
+msgid "Purchased date"
+msgstr "Einkaufsdatum"
+
+msgid "Consume all %s for this stock entry"
+msgstr "Verbrauche alle %s dieses Bestandseintrags"
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "Die Menge darf nicht kleiner als %1$s sein"
+
+msgid "Stock entry successfully updated"
+msgstr "Bestandseintrag wurde erfolgreich aktualisiert"
+
+msgid "Edit stock entry"
+msgstr "Bestandseintrag bearbeiten"
+
+msgid ""
+"Camera access is only possible when supported and allowed by your browser "
+"and when grocy is served via a secure (https://) connection"
+msgstr ""
+"Der Kamerazugriff ist nur möglich, wenn dein Browser dies unterstützt und "
+"zulässt und wenn auf grocy über eine sichere Verbindung (https://) "
+"zugegriffen wird"
+
+msgid "Keep screen on"
+msgstr "Bildschirm eingeschaltet lassen"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+"Bildschirm eingeschaltet lassen während eine \"fullscreen-card\" angezeigt "
+"wird"
+
+msgid "A purchased date is required"
+msgstr "Ein Einkaufsdatum ist erforderlich"
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+"Wenn ein Produkt ausgewählt ist, wird beim Verbrauch dieses Rezeptes eine "
+"Einheit (pro Portion in Einkaufsmengeneinheit) dem Bestand hinzugefügt"
+
+msgid "Produces product"
+msgstr "Produziertes Produkt"
+
+msgid "This booking cannot be undone"
+msgstr "Die Buchung kann nicht rückgängig gemacht werden"
+
+msgid "Booking does not exist or was already undone"
+msgstr "Buchung existiert nicht oder wurde bereits rückgängig gemacht"
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr "API key \"%s\" wirklich löschen?"
+
+msgid "Add note"
+msgstr "Notiz hinzufügen"
+
+msgid "Add note on %s"
+msgstr "Notiz am %s hinzufügen"
+
+msgid "per day"
+msgstr "pro Tag"
+
+msgid "Compact view"
+msgstr "Kompakte Ansicht"
+
+msgid "Normal view"
+msgstr "Normale Ansicht"
+
+msgid "Only undone items"
+msgstr "Nur unerledigte Einträge"
+
+msgid "Add product"
+msgstr "Produkt hinzufügen"
+
+msgid "Add product on %s"
+msgstr "Produkt am %s hinzufügen"
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+"Alle Zutaten, die diese Woche von Rezepten oder Produkten benötigt werden, "
+"aus dem Bestand entfernen"
+
+msgid "Meal plan recipe"
+msgstr "Speiseplan Rezept"
+
+msgid "Meal plan note"
+msgstr "Speiseplan Notiz"
+
+msgid "Meal plan product"
+msgstr "Speiseplan Produkt"
+
+msgid "Scan mode"
+msgstr "Scan-Modus"
+
+msgid "on"
+msgstr "an"
+
+msgid "off"
+msgstr "aus"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+"Scan-Modus ist eingeschaltet, aber nicht alle erforderlichen Felder konnten "
+"automatisch ausgefüllt werden"
+
+msgid "Is freezer"
+msgstr "Ist ein Gefrier-Standort (also z. B. ein Gefrierschrank)"
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+"Beim Umlagen von Produkten von/zu einem Gefrier-Standort wird das "
+"Mindesthaltbarkeitsdatum der Produkte automatisch entsprechend den "
+"Produkteinstellungen angepasst"
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+"Wenn dieses Produkt zu einem Gefrier-Standort umgelagert (sprich "
+"eingefroren) wird, wird das Mindesthaltbarkeitsdatum durch heute + diese "
+"Anzahl von Tagen ersetzt"
+
+msgid "Default best before days after freezing"
+msgstr "Standard Haltbartkeit in Tagen nach dem Einfrieren"
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+"Wenn dieses Produkt von einem Gefrier-Standort umgelagert (sprich aufgetaut)"
+" wird, wird das Mindesthaltbarkeitsdatum durch heute + diese Anzahl von "
+"Tagen ersetzt"
+
+msgid "Default best before days after thawing"
+msgstr "Standard Haltbartkeit in Tagen nach dem Auftauen"
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr "Dies kann nicht derselbe Standort wie \"Von Standort\" sein"
+
+msgid "Thawed"
+msgstr "Aufgetaut"
+
+msgid "Frozen"
+msgstr "Eingefroren"
+
+msgid "Are you sure to delete userentity \"%s\"?"
+msgstr "Benutzerentität \"%s\" wirklich löschen?"
+
+msgid "Shopping list settings"
+msgstr "Einkaufszettel-Einstellungen"
+
+msgid "Show a month-view calendar"
+msgstr "Einen Kalender (Monatsansicht) anzeigen"
+
+msgid "Don't automatically switch to the compact view on mobile devices"
+msgstr "Nicht automatisch zur Kompaktansicht wechseln auf mobilen Geräten"
+
+msgid "Edit note on %s"
+msgstr "Notiz am %s bearbeiten"
+
+msgid "Edit product on %s"
+msgstr "Produkt am %s bearbeiten"
+
+msgid "Edit recipe on %s"
+msgstr "Rezept am %s bearbeiten"
+
+msgid "Desired servings"
+msgstr "Gewünschte Portionen"
+
+msgid "Base: %s"
+msgstr "Basis: %s"
+
+msgid "Recipes settings"
+msgstr "Rezept-Einstellungen"
+
+msgid "Recipe card"
+msgstr "Rezept-Karte"
+
+msgid "Group ingredients by their product group"
+msgstr "Zutaten nach Produktgruppen gruppieren"
+
+msgid "Unknown store"
+msgstr "Unbekanntes Geschäft"
+
+msgid "Store"
+msgstr "Geschäft"
+
+msgid "Transaction successfully undone"
+msgstr "Transaktion erfolgreich rückgängig gemacht"
+
+msgid "Default store"
+msgstr "Standard Geschäft"
+
+msgid "Consume this stock entry"
+msgstr "Verbrauche diesen Bestandseintrag"
+
+msgid "Mark this stock entry as open"
+msgstr "Diesen Bestandseintrag als geöffnet markieren"
+
+msgid "Mark this item as done"
+msgstr "Diesen Eintrag als erledigt markieren"
+
+msgid "Edit this item"
+msgstr "Diesen Eintrag löschen"
+
+msgid "Delete this item"
+msgstr "Diesen Eintrag bearbeiten"
+
+msgid "Show an icon if the product is already on the shopping list"
+msgstr ""
+"Ein Symbol anzeigen, wenn das Produkt bereits auf dem Einkaufszettel steht"

localization/de/userfield_types.po

@@ -38,4 +38,10 @@ msgid "checkbox"
 msgstr "Kontrollkästchen"
 
 msgid "preset-list"
-msgstr "Auswahlliste (feste Werte)"
+msgstr "Auswahlliste (feste Werte, einzelner Wert kann ausgewählt werden)"
+
+msgid "preset-checklist"
+msgstr "Auswahlliste (feste Werte, mehrere Werte können ausgewählt werden)"
+
+msgid "link"
+msgstr "Link"

localization/demo_data.pot

@@ -156,9 +156,6 @@ msgstr ""
 msgid "Italian"
 msgstr ""
 
-msgid "Demo in different language"
-msgstr ""
-
 msgid "This is the note content of the recipe ingredient"
 msgstr ""
 
@@ -277,3 +274,88 @@ msgstr ""
 
 msgid "Polish"
 msgstr ""
+
+msgid "Milk Chocolate"
+msgstr ""
+
+msgid "Dark Chocolate"
+msgstr ""
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Example userentity"
+msgstr ""
+
+msgid "This is an example user entity..."
+msgstr ""
+
+msgid "Custom field"
+msgstr ""
+
+msgid "Example field value..."
+msgstr ""
+
+msgid "Waffle rolls"
+msgstr ""
+
+msgid "Danish"
+msgstr ""
+
+msgid "Dutch"
+msgstr ""
+
+msgid "Norwegian"
+msgstr ""
+
+msgid "Demo"
+msgstr ""
+
+msgid "Stable version"
+msgstr ""
+
+msgid "Preview version"
+msgstr ""
+
+msgid "current release"
+msgstr ""
+
+msgid "not yet released"
+msgstr ""
+
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""
+
+msgid "Czech"
+msgstr ""
+
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr ""
+
+msgid "Japanese"
+msgstr ""
+
+msgid "Chinese (Taiwan)"
+msgstr ""

localization/en/chore_assignment_types.po

@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "No assignment"
+
+msgid "who-least-did-first"
+msgstr "Who least did first"
+
+msgid "random"
+msgstr "Random"
+
+msgid "in-alphabetical-order"
+msgstr "In alphabetical order"

localization/en/chore_period_types.po

@@ -1,14 +1,15 @@
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
 "Last-Translator: Translation migration from old PHP array files\n"
 "Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
-"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
 "Language: en\n"
 "X-Domain: grocy/chore_types\n"
 
@@ -26,3 +27,6 @@ msgstr "Weekly"
 
 msgid "monthly"
 msgstr "Monthly"
+
+msgid "yearly"
+msgstr "Yearly"

localization/en/component_translations.po

@@ -29,3 +29,6 @@ msgstr "x"
 
 msgid "fullcalendar_locale"
 msgstr "x"
+
+msgid "bootstrap-select_locale"
+msgstr "x"

localization/en/demo_data.po

@@ -284,3 +284,9 @@ msgstr "Swedish"
 
 msgid "Polish"
 msgstr "Polish"
+
+msgid "DemoSupermarket1"
+msgstr "Walmart"
+
+msgid "DemoSupermarket2"
+msgstr "Kroger"

localization/en/stock_transaction_types.po

@@ -15,6 +15,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Purchase"
 
+msgid "transfer_to"
+msgstr "Transfer To"
+
+msgid "transfer_from"
+msgstr "Transfer From"
+
 msgid "consume"
 msgstr "Consume"
 
@@ -23,3 +29,12 @@ msgstr "Inventory correction"
 
 msgid "product-opened"
 msgstr "Product opened"
+
+msgid "stock-edit-old"
+msgstr "Stock entry edited (old values)"
+
+msgid "stock-edit-new"
+msgstr "Stock entry edited (new values)"
+
+msgid "self-production"
+msgstr "Self-production"

localization/en/strings.po

@@ -66,6 +66,9 @@ msgstr "Products"
 msgid "Locations"
 msgstr "Locations"
 
+msgid "Shopping locations"
+msgstr "Shopping locations"
+
 msgid "Quantity units"
 msgstr "Quantity units"
 
@@ -162,6 +165,9 @@ msgstr "Name"
 msgid "Location"
 msgstr "Location"
 
+msgid "Shopping location"
+msgstr "Shopping location"
+
 msgid "Min. stock amount"
 msgstr "Min. stock amount"
 
@@ -201,6 +207,9 @@ msgstr "Factor purchase to stock quantity unit"
 msgid "Create location"
 msgstr "Create location"
 
+msgid "Create shopping location"
+msgstr "Create shopping location"
+
 msgid "Create quantity unit"
 msgstr "Create quantity unit"
 
@@ -234,6 +243,9 @@ msgstr "Edit product"
 msgid "Edit location"
 msgstr "Edit location"
 
+msgid "Edit shopping location"
+msgstr "Edit shopping location"
+
 msgid "Record data"
 msgstr "Record data"
 
@@ -306,6 +318,9 @@ msgstr "Are you sure to delete product \"%s\"?"
 msgid "Are you sure to delete location \"%s\"?"
 msgstr "Are you sure to delete location \"%s\"?"
 
+msgid "Are you sure to delete shopping location \"%s\"?"
+msgstr "Are you sure to delete shopping location \"%s\"?"
+
 msgid "Manage API keys"
 msgstr "Manage API keys"
 
@@ -1035,6 +1050,9 @@ msgstr "Tare weight handling enabled - please weigh the whole container, the amo
 msgid "You have to select a location"
 msgstr "You have to select a location"
 
+msgid "You have to select a shopping location"
+msgstr "You have to select a shopping location"
+
 msgid "List"
 msgstr "List"
 

localization/en/userfield_types.po

@@ -32,3 +32,12 @@ msgstr "Date & time"
 
 msgid "checkbox"
 msgstr "Checkbox"
+
+msgid "preset-list"
+msgstr "Select list (a single item can be selected)"
+
+msgid "preset-checklist"
+msgstr "Select list (multiple items can be selected)"
+
+msgid "link"
+msgstr "Link"

localization/en_GB/chore_assignment_types.po

@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "No assignment"
+
+msgid "who-least-did-first"
+msgstr "Who least did first"
+
+msgid "random"
+msgstr "Random"
+
+msgid "in-alphabetical-order"
+msgstr "In alphabetical order"

localization/en_GB/chore_period_types.po

@@ -4,26 +4,29 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
-"PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Language-Team: Tamil (https://www.transifex.com/grocy/teams/93189/ta/)\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en\n"
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr ""
+msgstr "Manually"
 
 msgid "dynamic-regular"
-msgstr ""
+msgstr "Dynamic regular"
 
 msgid "daily"
-msgstr ""
+msgstr "Daily"
 
 msgid "weekly"
-msgstr ""
+msgstr "Weekly"
 
 msgid "monthly"
-msgstr ""
+msgstr "Monthly"
+
+msgid "yearly"
+msgstr "Yearly"

localization/en_GB/chore_types.po

@@ -1,29 +0,0 @@
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
-"PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Domain: grocy/chore_types\n"
-
-msgid "manually"
-msgstr ""
-
-msgid "dynamic-regular"
-msgstr ""
-
-msgid "daily"
-msgstr ""
-
-msgid "weekly"
-msgstr ""
-
-msgid "monthly"
-msgstr ""

localization/en_GB/component_translations.po

@@ -1,35 +1,34 @@
-# Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
-"PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
 "X-Domain: grocy/component_translations\n"
 
 msgid "timeago_locale"
-msgstr ""
+msgstr "en"
 
 msgid "timeago_nan"
-msgstr ""
+msgstr "NaN years ago"
 
 msgid "moment_locale"
-msgstr "en-gb"
+msgstr "x"
 
 msgid "datatables_localization"
-msgstr ""
+msgstr "{\"sEmptyTable\":\"No data available in table\",\"sInfo\":\"Showing _START_ to _END_ of _TOTAL_ entries\",\"sInfoEmpty\":\"Showing 0 to 0 of 0 entries\",\"sInfoFiltered\":\"(filtered from _MAX_ total entries)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Show _MENU_ entries\",\"sLoadingRecords\":\"Loading...\",\"sProcessing\":\"Processing...\",\"sSearch\":\"Search:\",\"sZeroRecords\":\"No matching records found\",\"oPaginate\":{\"sFirst\":\"First\",\"sLast\":\"Last\",\"sNext\":\"Next\",\"sPrevious\":\"Previous\"},\"oAria\":{\"sSortAscending\":\": activate to sort column ascending\",\"sSortDescending\":\": activate to sort column descending\"}}"
 
 msgid "summernote_locale"
-msgstr "en-gb"
+msgstr "x"
 
 msgid "fullcalendar_locale"
-msgstr "en-gb"
+msgstr "x"
+
+msgid "bootstrap-select_locale"
+msgstr "x"

localization/en_GB/demo_data.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,267 +17,349 @@ msgstr ""
 "X-Domain: grocy/demo_data\n"
 
 msgid "Cookies"
-msgstr ""
+msgstr "Cookies"
 
 msgid "Chocolate"
-msgstr ""
+msgstr "Chocolate"
 
 msgid "Pantry"
-msgstr ""
+msgstr "Pantry"
 
 msgid "Candy cupboard"
-msgstr ""
+msgstr "Candy cupboard"
 
 msgid "Tinned food cupboard"
-msgstr ""
+msgstr "Tinned food cupboard"
 
 msgid "Fridge"
-msgstr ""
+msgstr "Fridge"
 
 msgid "Piece"
 msgid_plural "Pieces"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Piece"
+msgstr[1] "Pieces"
 
 msgid "Pack"
 msgid_plural "Packs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pack"
+msgstr[1] "Packs"
 
 msgid "Glass"
 msgid_plural "Glasses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Glass"
+msgstr[1] "Glasses"
 
 msgid "Tin"
 msgid_plural "Tins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tin"
+msgstr[1] "Tins"
 
 msgid "Can"
 msgid_plural "Cans"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Can"
+msgstr[1] "Cans"
 
 msgid "Bunch"
 msgid_plural "Bunches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bunch"
+msgstr[1] "Bunches"
 
 msgid "Gummy bears"
-msgstr ""
+msgstr "Gummy bears"
 
 msgid "Crisps"
-msgstr ""
+msgstr "Crisps"
 
 msgid "Eggs"
-msgstr ""
+msgstr "Eggs"
 
 msgid "Noodles"
-msgstr ""
+msgstr "Noodles"
 
 msgid "Pickles"
-msgstr ""
+msgstr "Pickles"
 
 msgid "Gulash soup"
-msgstr ""
+msgstr "Gulash soup"
 
 msgid "Yogurt"
-msgstr ""
+msgstr "Yogurt"
 
 msgid "Cheese"
-msgstr ""
+msgstr "Cheese"
 
 msgid "Cold cuts"
-msgstr ""
+msgstr "Cold cuts"
 
 msgid "Paprika"
-msgstr ""
+msgstr "Paprika"
 
 msgid "Cucumber"
-msgstr ""
+msgstr "Cucumber"
 
 msgid "Radish"
-msgstr ""
+msgstr "Radish"
 
 msgid "Tomato"
-msgstr ""
+msgstr "Tomato"
 
 msgid "Changed towels in the bathroom"
-msgstr ""
+msgstr "Changed towels in the bathroom"
 
 msgid "Cleaned the kitchen floor"
-msgstr ""
+msgstr "Cleaned the kitchen floor"
 
 msgid "Warranty ends"
-msgstr ""
+msgstr "Warranty ends"
 
 msgid "TV remote control"
-msgstr ""
+msgstr "TV remote control"
 
 msgid "Alarm clock"
-msgstr ""
+msgstr "Alarm clock"
 
 msgid "Heat remote control"
-msgstr ""
+msgstr "Heat remote control"
 
 msgid "Lawn mowed in the garden"
-msgstr ""
+msgstr "Lawn mowed in the garden"
 
 msgid "Some good snacks"
-msgstr ""
+msgstr "Some good snacks"
 
 msgid "Pizza dough"
-msgstr ""
+msgstr "Pizza dough"
 
 msgid "Sieved tomatoes"
-msgstr ""
+msgstr "Sieved tomatoes"
 
 msgid "Salami"
-msgstr ""
+msgstr "Salami"
 
 msgid "Toast"
-msgstr ""
+msgstr "Toast"
 
 msgid "Minced meat"
-msgstr ""
+msgstr "Minced meat"
 
 msgid "Pizza"
-msgstr ""
+msgstr "Pizza"
 
 msgid "Spaghetti bolognese"
-msgstr ""
+msgstr "Spaghetti bolognese"
 
 msgid "Sandwiches"
-msgstr ""
+msgstr "Sandwiches"
 
 msgid "English"
-msgstr ""
+msgstr "English"
 
 msgid "German"
-msgstr ""
+msgstr "German"
 
 msgid "Italian"
-msgstr ""
-
-msgid "Demo in different language"
-msgstr ""
+msgstr "Italian"
 
 msgid "This is the note content of the recipe ingredient"
-msgstr ""
+msgstr "This is the note content of the recipe ingredient"
 
 msgid "Demo User"
-msgstr ""
+msgstr "Demo User"
 
 msgid "Gram"
 msgid_plural "Grams"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gram"
+msgstr[1] "Grams"
 
 msgid "Flour"
-msgstr ""
+msgstr "Flour"
 
 msgid "Pancakes"
-msgstr ""
+msgstr "Pancakes"
 
 msgid "Sugar"
-msgstr ""
+msgstr "Sugar"
 
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 msgid "Life"
-msgstr ""
+msgstr "Life"
 
 msgid "Projects"
-msgstr ""
+msgstr "Projects"
 
 msgid "Repair the garage door"
-msgstr ""
+msgstr "Repair the garage door"
 
 msgid "Fork and improve grocy"
-msgstr ""
+msgstr "Fork and improve grocy"
 
 msgid "Find a solution for what to do when I forget the door keys"
-msgstr ""
+msgstr "Find a solution for what to do when I forget the door keys"
 
 msgid "Sweets"
-msgstr ""
+msgstr "Sweets"
 
 msgid "Bakery products"
-msgstr ""
+msgstr "Bakery products"
 
 msgid "Tinned food"
-msgstr ""
+msgstr "Tinned food"
 
 msgid "Butchery products"
-msgstr ""
+msgstr "Butchery products"
 
 msgid "Vegetables/Fruits"
-msgstr ""
+msgstr "Vegetables/Fruits"
 
 msgid "Refrigerated products"
-msgstr ""
+msgstr "Refrigerated products"
 
 msgid "Coffee machine"
-msgstr ""
+msgstr "Coffee machine"
 
 msgid "Dishwasher"
-msgstr ""
+msgstr "Dishwasher"
 
 msgid "Liter"
-msgstr ""
+msgstr "Liter"
 
 msgid "Liters"
-msgstr ""
+msgstr "Liters"
 
 msgid "Bottle"
-msgstr ""
+msgstr "Bottle"
 
 msgid "Bottles"
-msgstr ""
+msgstr "Bottles"
 
 msgid "Milk"
-msgstr ""
+msgstr "Milk"
 
 msgid "Chocolate sauce"
-msgstr ""
+msgstr "Chocolate sauce"
 
 msgid "Milliliters"
-msgstr ""
+msgstr "Milliliters"
 
 msgid "Milliliter"
-msgstr ""
+msgstr "Milliliter"
 
 msgid "Bottom"
-msgstr ""
+msgstr "Bottom"
 
 msgid "Topping"
-msgstr ""
+msgstr "Topping"
 
 msgid "French"
-msgstr ""
+msgstr "French"
 
 msgid "Turkish"
-msgstr ""
+msgstr "Turkish"
 
 msgid "Spanish"
-msgstr ""
+msgstr "Spanish"
 
 msgid "Russian"
-msgstr ""
+msgstr "Russian"
 
 msgid "The thing which happens on the 5th of every month"
-msgstr ""
+msgstr "The thing which happens on the 5th of every month"
 
 msgid "The thing which happens daily"
-msgstr ""
+msgstr "The thing which happens daily"
 
 msgid "The thing which happens on Mondays and Wednesdays"
-msgstr ""
+msgstr "The thing which happens on Mondays and Wednesdays"
 
 msgid "Swedish"
-msgstr ""
+msgstr "Swedish"
 
 msgid "Polish"
+msgstr "Polish"
+
+msgid "Milk Chocolate"
+msgstr "Milk Chocolate"
+
+msgid "Dark Chocolate"
+msgstr "Dark Chocolate"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Slice"
+msgstr[1] "Slices"
+
+msgid "Example userentity"
+msgstr "Example userentity"
+
+msgid "This is an example user entity..."
+msgstr "This is an example user entity..."
+
+msgid "Custom field"
+msgstr "Custom field"
+
+msgid "Example field value..."
+msgstr "Example field value..."
+
+msgid "Waffle rolls"
+msgstr "Waffle rolls"
+
+msgid "Danish"
+msgstr "Danish"
+
+msgid "Dutch"
+msgstr "Dutch"
+
+msgid "Norwegian"
+msgstr "Norwegian"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stable version"
+
+msgid "Preview version"
+msgstr "Preview version"
+
+msgid "current release"
+msgstr "current release"
+
+msgid "not yet released"
+msgstr "not yet released"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portuguese (Brazil)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""
+
+msgid "Czech"
+msgstr ""
+
+msgid "Portuguese (Portugal)"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr ""
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr ""
+
+msgid "Japanese"
+msgstr ""
+
+msgid "Chinese (Taiwan)"
 msgstr ""

localization/en_GB/stock_transaction_types.po

@@ -1,26 +1,40 @@
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
-"PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr ""
+msgstr "Purchase"
+
+msgid "transfer_to"
+msgstr "Transfer To"
+
+msgid "transfer_from"
+msgstr "Transfer From"
 
 msgid "consume"
-msgstr ""
+msgstr "Consume"
 
 msgid "inventory-correction"
-msgstr ""
+msgstr "Inventory correction"
 
 msgid "product-opened"
-msgstr ""
+msgstr "Product opened"
+
+msgid "stock-edit-old"
+msgstr "Stock entry edited (old values)"
+
+msgid "stock-edit-new"
+msgstr "Stock entry edited (new values)"
+
+msgid "self-production"
+msgstr "Self-production"

localization/en_GB/userfield_types.po

@@ -1,38 +1,43 @@
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
-"PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr ""
+msgstr "Text (single line)"
 
 msgid "text-multi-line"
-msgstr ""
+msgstr "Text (multi line)"
 
 msgid "number-integral"
-msgstr ""
+msgstr "Number (integral)"
 
 msgid "number-decimal"
-msgstr ""
+msgstr "Number (decimal)"
 
 msgid "date"
-msgstr ""
+msgstr "Date (without time)"
 
 msgid "datetime"
-msgstr ""
+msgstr "Date & time"
 
 msgid "checkbox"
-msgstr ""
+msgstr "Checkbox"
 
 msgid "preset-list"
-msgstr ""
+msgstr "Select list (a single item can be selected)"
+
+msgid "preset-checklist"
+msgstr "Select list (multiple items can be selected)"
+
+msgid "link"
+msgstr "Link"

localization/es/chore_assignment_types.po

@@ -0,0 +1,30 @@
+# Translators:
+# Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
+# Igor Perez <igordiablo@hotmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Igor Perez <igordiablo@hotmail.com>, 2020\n"
+"Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "sin-asignar"
+
+msgid "who-least-did-first"
+msgstr "quien-menos-primero"
+
+msgid "random"
+msgstr "al-azar"
+
+msgid "in-alphabetical-order"
+msgstr "por-orden-alfabético"

localization/es/chore_period_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Jose Rugel <joserugel@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Jose Rugel <joserugel@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,16 +17,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Manualmente"
+msgstr "manualmente"
 
 msgid "dynamic-regular"
-msgstr "Dinámico regular"
+msgstr "dinamico-regular"
 
 msgid "daily"
-msgstr "Diario"
+msgstr "diariamente"
 
 msgid "weekly"
-msgstr "Semanal"
+msgstr "semanalmente"
 
 msgid "monthly"
-msgstr "Mensual"
+msgstr "mensualmente"
+
+msgid "yearly"
+msgstr "Anualmente"

localization/es/component_translations.po

@@ -1,5 +1,6 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Jose Rugel <joserugel@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Jose Rugel <joserugel@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,19 +28,37 @@ msgstr "es"
 
 msgid "datatables_localization"
 msgstr ""
-"{\"sEmptyTable\":\"Sin datos en la tabla\",\"sInfo\":\"Mostrando de  _START_"
-" a _END_ de _TOTAL_ entradas\",\"sInfoEmpty\":\"Mostrando de 0 a 0 de 0 "
-"entradas\",\"sInfoFiltered\":\"(filtrando a _MAX_ entradas "
-"máximas)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Mostrar"
-" _MENU_ "
-"entradas\",\"sLoadingRecords\":\"Cargando...\",\"sProcessing\":\"Procesando...\",\"sSearch\":\"Buscar:\",\"sZeroRecords\":\"No"
-" se han encontrado resultados "
-"coincidentes\",\"oPaginate\":{\"sFirst\":\"Primero\",\"sLast\":\"Último\",\"sNext\":\"Siguiente\",\"sPrevious\":\"Anterior\"},\"oAria\":{\"sSortAscending\":\":"
-" activar para ordenar ascendentemente\",\"sSortDescending\":\": activar para"
-" ordenar descendentemente\"}}"
+"{\n"
+"\"sEmptyTable\":\"Sin datos en la tabla\"\n"
+",\"sInfo\":\"Mostrando de _START_ a _END_ de _TOTAL_ entradas\"\n"
+",\"sInfoEmpty\":\"Mostrando de 0 a 0 de 0 entradas\"\n"
+",\"sInfoFiltered\":\"(filtrando a _MAX_ entradas máximas)\"\n"
+",\"sInfoPostFix\":\"\"\n"
+",\"sInfoThousands\":\",\"\n"
+",\"sLengthMenu\":\"Mostrar _MENU_ entradas\"\n"
+",\"sLoadingRecords\":\"Cargando ...\"\n"
+",\"sProcessing\":\"Procesando ...\"\n"
+",\"sSearch\":\"Buscar\"\n"
+",\"sZeroRecords\":\"No se han encontrado resultados coincidentes\"\n"
+",\"oPaginate\":\n"
+"{\n"
+"\"sFirst\":\"Primero\"\n"
+",\"sLast\":\"Último\"\n"
+",\"sNext\":\"Siguiente\"\n"
+",\"sPrevious\":\"Anterior\"\n"
+"}\n"
+",\"oAria\":\n"
+"{\n"
+"\"sSortAscending\":\"orden ascendente\"\n"
+",\"sSortDescending\":\"orden descendente\"\n"
+"}\n"
+"}"
 
 msgid "summernote_locale"
 msgstr "es-ES"
 
 msgid "fullcalendar_locale"
 msgstr "es"
+
+msgid "bootstrap-select_locale"
+msgstr "es_ES"

localization/es/demo_data.po

@@ -1,7 +1,8 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
-# Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
 # Ankue <ankue.spam@gmail.com>, 2019
+# Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
+# Igor Perez <igordiablo@hotmail.com>, 2020
+# Jose Rugel <joserugel@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Ankue <ankue.spam@gmail.com>, 2019\n"
+"Last-Translator: Jose Rugel <joserugel@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +35,7 @@ msgid "Tinned food cupboard"
 msgstr "Estante de las latas"
 
 msgid "Fridge"
-msgstr "Nevera"
+msgstr "Refrigerador"
 
 msgid "Piece"
 msgid_plural "Pieces"
@@ -43,8 +44,8 @@ msgstr[1] "Piezas"
 
 msgid "Pack"
 msgid_plural "Packs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Paquetes"
+msgstr[1] "Paquetes"
 
 msgid "Glass"
 msgid_plural "Glasses"
@@ -53,21 +54,21 @@ msgstr[1] "Vasos"
 
 msgid "Tin"
 msgid_plural "Tins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Envases"
+msgstr[1] "Latas"
 
 msgid "Can"
 msgid_plural "Cans"
 msgstr[0] "Lata"
-msgstr[1] "Latas"
+msgstr[1] "Envases"
 
 msgid "Bunch"
 msgid_plural "Bunches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Puñados"
+msgstr[1] "Puñados"
 
 msgid "Gummy bears"
-msgstr "Ositos"
+msgstr "Ositos de goma"
 
 msgid "Crisps"
 msgstr "Patatas fritas"
@@ -82,7 +83,7 @@ msgid "Pickles"
 msgstr "Pepinillos"
 
 msgid "Gulash soup"
-msgstr "Sopa"
+msgstr "Sopa Gulash"
 
 msgid "Yogurt"
 msgstr "Yogurt"
@@ -115,13 +116,13 @@ msgid "Warranty ends"
 msgstr "Final de la garantía"
 
 msgid "TV remote control"
-msgstr "Mando de la TV"
+msgstr "Control remoto del televisor"
 
 msgid "Alarm clock"
 msgstr "Despertador"
 
 msgid "Heat remote control"
-msgstr "Mando de la calefacción"
+msgstr "Control remoto de la calefacción"
 
 msgid "Lawn mowed in the garden"
 msgstr "Cortar el césped del jardín"
@@ -133,10 +134,10 @@ msgid "Pizza dough"
 msgstr "Masa de pizza"
 
 msgid "Sieved tomatoes"
-msgstr "Tomate triturado"
+msgstr "Tomates triturados"
 
 msgid "Salami"
-msgstr "Salami"
+msgstr "Salame"
 
 msgid "Toast"
 msgstr "Tostada"
@@ -148,10 +149,10 @@ msgid "Pizza"
 msgstr "Pizza"
 
 msgid "Spaghetti bolognese"
-msgstr "Spaghetti boloñesa"
+msgstr "Spaghetti a la boloñesa"
 
 msgid "Sandwiches"
-msgstr "Bocadillos"
+msgstr "Sándwiches"
 
 msgid "English"
 msgstr "Inglés"
@@ -162,9 +163,6 @@ msgstr "Alemán"
 msgid "Italian"
 msgstr "Italiano"
 
-msgid "Demo in different language"
-msgstr "Demo en otro idioma"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Este es el contenido de la nota del ingrediente de la receta"
 
@@ -180,13 +178,13 @@ msgid "Flour"
 msgstr "Harina"
 
 msgid "Pancakes"
-msgstr "Tortitas"
+msgstr "Panqueques"
 
 msgid "Sugar"
-msgstr "Azucar"
+msgstr "Azúcar"
 
 msgid "Home"
-msgstr "Casa"
+msgstr "Inicio"
 
 msgid "Life"
 msgstr "Vida"
@@ -255,16 +253,16 @@ msgid "Bottom"
 msgstr "Fondo"
 
 msgid "Topping"
-msgstr "Parte superior"
+msgstr "Cobertura"
 
 msgid "French"
 msgstr "Francés"
 
 msgid "Turkish"
-msgstr "Turkish"
+msgstr "Turco"
 
 msgid "Spanish"
-msgstr "Spanish"
+msgstr "Español"
 
 msgid "Russian"
 msgstr "Ruso"
@@ -276,10 +274,95 @@ msgid "The thing which happens daily"
 msgstr "Lo que ocurre diariamente"
 
 msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "Lo que ocurre los lunes y los miércoles"
+msgstr "Lo que ocurre los Lunes y los Miércoles"
 
 msgid "Swedish"
 msgstr "Sueco"
 
 msgid "Polish"
 msgstr "Polaco"
+
+msgid "Milk Chocolate"
+msgstr "Chocolate con leche"
+
+msgid "Dark Chocolate"
+msgstr "Chocolate negro"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Lonchas"
+msgstr[1] "Rebanadas"
+
+msgid "Example userentity"
+msgstr "Entidad de usuario de ejemplo"
+
+msgid "This is an example user entity..."
+msgstr "Esto es un ejemplo de una entidad personalizada ..."
+
+msgid "Custom field"
+msgstr "Campo personalizado"
+
+msgid "Example field value..."
+msgstr "Valor del campo de ejemplo ..."
+
+msgid "Waffle rolls"
+msgstr "Canutillos"
+
+msgid "Danish"
+msgstr "Danés"
+
+msgid "Dutch"
+msgstr "Holandés"
+
+msgid "Norwegian"
+msgstr "Noruego"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Versión estable"
+
+msgid "Preview version"
+msgstr "Versión previa"
+
+msgid "current release"
+msgstr "Elaboración actual"
+
+msgid "not yet released"
+msgstr "Todavía no elaborado"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugués (Brasil)"
+
+msgid "This is a note"
+msgstr "Esto es una nota"
+
+msgid "Freezer"
+msgstr "Congelador"
+
+msgid "Hungarian"
+msgstr "Húngaro"
+
+msgid "Slovak"
+msgstr "Eslovaco"
+
+msgid "Czech"
+msgstr "Checo"
+
+msgid "Portuguese (Portugal)"
+msgstr "Portugués (Portugal)"
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr "DemoSupermercado1"
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr "DemoSupermercado2"
+
+msgid "Japanese"
+msgstr "Japonés"
+
+msgid "Chinese (Taiwan)"
+msgstr "Chino (Taiwan)"

localization/es/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Jose Rugel <joserugel@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Jose Rugel <joserugel@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr "Compra"
+msgstr "compra"
+
+msgid "transfer_from"
+msgstr "trasladar_desde"
+
+msgid "transfer_to"
+msgstr "trasladar_a"
 
 msgid "consume"
-msgstr "Consumo"
+msgstr "consumo"
 
 msgid "inventory-correction"
-msgstr "Corrección de inventario"
+msgstr "inventario-correccion"
 
 msgid "product-opened"
-msgstr "Producto abierto"
+msgstr "producto-abierto"
+
+msgid "stock-edit-old"
+msgstr "existencia-editar-viejo"
+
+msgid "stock-edit-new"
+msgstr "existencia-editar-nuevo"
+
+msgid "self-production"
+msgstr "produccion-propia"

localization/es/userfield_types.po

@@ -1,5 +1,6 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
+# Jose Rugel <joserugel@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Jose Rugel <joserugel@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +18,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr "Texto (una línea)"
+msgstr "texto-unica-linea"
 
 msgid "text-multi-line"
-msgstr "Texto (múltiples líneas)"
+msgstr "texto-multi-linea"
 
 msgid "number-integral"
-msgstr "Número (entero)"
+msgstr "numero-entero"
 
 msgid "number-decimal"
-msgstr "Número (decimal)"
+msgstr "numero-decimal"
 
 msgid "date"
-msgstr "Fecha (sin hora)"
+msgstr "fecha"
 
 msgid "datetime"
-msgstr "Fecha y hora"
+msgstr "fecha-hora"
 
 msgid "checkbox"
-msgstr "Casilla de verificación"
+msgstr "casilla-verificacion"
+
+msgid "preset-list"
+msgstr "lista-predefinida"
+
+msgid "preset-checklist"
+msgstr "casillas-predefinidas"
+
+msgid "link"
+msgstr "enlace"