kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Streamline in stock / out of stock wording

Browse Source
This commit is contained in:
Bernd Bestel 2025-01-18 10:33:26 +01:00
parent 23d7b6ad3c
commit 83b8b95b73
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
18 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
changelog/60_3.0.0_2020-12-22.md
View File

@ -56,14 +56,14 @@
- Products can now be duplicated (new dropdown menu item on the products list page, all fields will be preset from the copied product, except the name)
- Products can now be merged (new dropdown menu item on the products list page)
- Useful if you have two products which are basically the same and want to replace all occurrences of one with the other one
- When consuming or opening a parent product, which is currently not in stock, any in-stock sub product will now be consumed/opened (like already automatically done when consuming recipes)
- When consuming or opening a parent product, which is currently not in stock, any in stock sub product will now be consumed/opened (like already automatically done when consuming recipes)
- Opened stock entries get now consumed first by default when no specific stock entry is used/selected
- So the default consume rule is now "Opened first, then first due first, then first in first out"
- Optimized/clarified what the total/unit price on the purchase page is (thanks @kriddles)
- On the purchase page the amount field is now displayed above/before the due date for better `TAB` handling (thanks @kriddles)
- Changed that when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is disabled, products now get internally a due date of "never overdue" (aka `2999-12-31`) instead of today (thanks @kriddles)
- Products can now be disabled to keep the history/journal, but hide it everywhere, without deleting it (new product option "Active", deleting a product now explicitly also deletes its journal and all other references) (thanks @kriddles for the initial work on this)
- Products can now be hidden from the stock overview page, even if they are in-stock (new product option "Never show on stock overview", disabled by default, so no changed behavior when not configured)
- Products can now be hidden from the stock overview page, even if they are in stock (new product option "Never show on stock overview", disabled by default, so no changed behavior when not configured)
- That's maybe useful for parent products you only use as a kind of "container"
- The due date is now also prefilled on the inventory page based on the products "Default due days" (was only done on the purchase page before)
- On the stock journal page, it's now visible if a consume-booking was spoiled
@ -100,7 +100,7 @@
- Fixed that a "Total price" on purchase was not handled correctly for tare weight handling enabled products (the total price was wrongly related to the amount including the tare weight)
### Shopping list improvements
- Added a button to add all currently in-stock but overdue and expired products to the shopping list (thanks @m-byte)
- Added a button to add all currently in stock but overdue and expired products to the shopping list (thanks @m-byte)
- Improved that when `FEATURE_FLAG_STOCK` is disabled, all product/stock related inputs and buttons are now hidden on the shopping list page (thanks @fipwmaqzufheoxq92ebc)
- Shopping list items can now have their own Userfields (entity `shopping_list`), on the shopping list table those fields are rendered additionally to the product Userfields
- The print view is now configurable (new dialog before printing - option to hide header, group products by their product group, alternative list layout)
@ -253,8 +253,8 @@
- `>=` greater or equal
- `§` regular expression
- `<value>` is the value to search for
- New endpoint `/stock/shoppinglist/add-overdue-products` to add all currently in-stock but overdue products to a shopping list (thanks @m-byte)
- New endpoint `/stock/shoppinglist/add-expired-products` to add all currently in-stock but expired products to a shopping list
- New endpoint `/stock/shoppinglist/add-overdue-products` to add all currently in stock but overdue products to a shopping list (thanks @m-byte)
- New endpoint `/stock/shoppinglist/add-expired-products` to add all currently in stock but expired products to a shopping list
- New endpoints GET/POST/PUT `/users/{userId}/permissions` for the new user permissions feature mentioned above
- New endpoint `/user` to get the currently authenticated user
- New endpoint DELETE `/user/settings/{settingKey}` to delete a user setting

2
changelog/62_3.1.0_2021-07-16.md
View File

@ -38,7 +38,7 @@
- Product barcodes are now enforced to be unique across products
- On the stock overview page it's now also possible to search/filter by product barcodes (via the general search field)
- The product picker on the consume and transfer page now only shows products which are currently in stock
- Added a filter option to only show currently in-stock products on the stock overview and products list (master data) page
- Added a filter option to only show currently in stock products on the stock overview and products list (master data) page
- Added new columns on the stock overview page (hidden by default): Product description, product default location, parent product, product picture
- Added a new product option "Should not be frozen" (defaults to disabled and only visible when `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` is enabled)
- When enabled, on moving the product to a freezer location (so when freezing it), a corresponding warning will be shown

2
changelog/67_3.3.0_2022-04-08.md
View File

@ -40,7 +40,7 @@
- => Instead the corresponding inverse conversion is now always created/updated/deleted automatically
- New product option "Disable own stock" (defaults to disabled)
- When enabled, the corresponding product can't have own stock, means it will not be selectable on purchase (useful for parent products which are just used as a summary/total view of the sub products)
- The location content sheet can now optionally list also out of stock products (at the products default location, new checkbox "Show only in-stock products" at the top of the page, defaults to enabled)
- The location content sheet can now optionally list also out of stock products (at the products default location, new checkbox "Show only in stock products" at the top of the page, defaults to enabled)
- Added a location filter to the stock entries page
- Added the product Grocycode as a (hidden by default) column to the products list (master data)
- The price entered on the inventory page is now related to the selected quantity unit (like on the purchase page, was always related to the products stock QU before)

4
changelog/70_4.0.0_2023-07-29.md
View File

@ -37,7 +37,7 @@
- This option will be automatically set on changing the entry's due date
- The product option "Quick consume amount" (the amount used for the "quick consume/open buttons" on the stock overview page) has been split into another option "Quick open amount", to be able to set different amounts for consume and open (defaults to the "Quick consume amount" per product, so no changed behavior when not configured)
- Changed that for the product's average and last price (and for the price history chart) stock transactions with an empty or `0` price are ignored
- Added a filter option to only show currently out-of-stock products on the products list (master data) page
- Added a filter option to only show currently out of stock products on the products list (master data) page
- When clicking a product name on the products list (master data) or on the stock journal page, the product card will now be displayed (like on the stock overview page)
- When using/scanning a product barcode and the purchase or inventory page, the barcode's note will now also be prefilled (if any)
- Each row on the stock journal now also has a context-/more menu for quick access to product related actions (the same as on the stock overview page)
@ -45,7 +45,7 @@
- Fixed that hiding the "Purchased date" column (table options) on the stock entries page didn't work
- Fixed that sorting by the "Value" and "Min. stock amount" columns on the stock overview page didn't work
- Fixed that the consumed amount was wrong, when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved
- Fixed that for a product's average price, only currently in-stock items were considered, not already consumed ones
- Fixed that for a product's average price, only currently in stock items were considered, not already consumed ones
- Fixed that when copying a product, some fields (like "Default consume location" or "Disable own stock) weren't copied along
- Fixed that the total product count on the stock overview page also included products with "Never show on stock overview" enabled

4
changelog/77_UNRELEASED_xxxx-xx-xx.md
View File

@ -18,7 +18,7 @@
### Stock
- Added a new stock setting (top right corner settings menu) "Show all out of stock products" to optionally also show all out of stock products on the stock overview page (defaults to disabled, so no changed behavior when not configured)
- By default the stock overview page lists all products which are currently in-stock or below their min. stock amount
- By default the stock overview page lists all products which are currently in stock or below their min. stock amount
- When this new setting is enabled, all (active) products are always shown
- Product barcode matching is now case-insensitive
- Added a new column "Product picture" on the products list (master data) page (hidden by default)
@ -38,7 +38,7 @@
### Recipes
- Consuming a recipe is now also possible when not all needed ingredients are currently in stock (the in stock amount, if any, of the corresponding ingredient will be consumed in that case)
- For in-stock ingredients, the amount actually in-stock is now displayed next to the hint "Enough in stock"
- For in stock ingredients, the amount actually in stock is now displayed next to the hint "Enough in stock"
- Optimized that when adding missing recipe ingredients with the option "Only check if any amount is in stock" enabled to the shopping list and when no corresponding unit conversion exists, the amount/unit is now taken "as is" (as defined in the recipe ingredient) into the created shopping list item
- When no price information is available for at least one ingredient, a red exclamation mark is now displayed next to the recipe total cost information
- Fixed that calories/costs of recipe ingredients were wrong when the ingredient option "Only check if any amount is in stock" was set and the on the ingredient used quantity unit was different from the product's QU stock

2
config-dist.php
View File

@ -192,7 +192,7 @@ DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', fals
DefaultUserSetting('scan_mode_consume_enabled', false); // If scan mode on the consume page is enabled
DefaultUserSetting('scan_mode_purchase_enabled', false); // If scan mode on the purchase page is enabled
DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true); // When enabled, an icon is shown on the stock overview page (next to the product name) when the prodcut is currently on a shopping list
DefaultUserSetting('stock_overview_show_all_out_of_stock_products', false); // By default the stock overview page lists all products which are currently in-stock or below their min. stock amount - when this is enabled, all (active) products are always shown
DefaultUserSetting('stock_overview_show_all_out_of_stock_products', false); // By default the stock overview page lists all products which are currently in stock or below their min. stock amount - when this is enabled, all (active) products are always shown
DefaultUserSetting('show_purchased_date_on_purchase', false); // Whether the purchased date should be editable on purchase (defaults to today otherwise)
DefaultUserSetting('show_warning_on_purchase_when_due_date_is_earlier_than_next', true); // Show a warning on purchase when the due date of the purchased product is earlier than the next due date in stock

8
grocy.openapi.json
View File

@ -2007,7 +2007,7 @@
},
"allow_subproduct_substitution": {
"type": "boolean",
"description": "`true` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
"description": "`true` when any in stock sub product should be used when the given product is a parent product and currently not in stock"
}
},
"example": {
@ -2242,7 +2242,7 @@
},
"allow_subproduct_substitution": {
"type": "boolean",
"description": "`true` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
"description": "`true` when any in stock sub product should be used when the given product is a parent product and currently not in stock"
}
},
"example": {
@ -2540,7 +2540,7 @@
},
"allow_subproduct_substitution": {
"type": "boolean",
"description": "`rue` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
"description": "`rue` when any in stock sub product should be used when the given product is a parent product and currently not in stock"
}
},
"example": {
@ -2763,7 +2763,7 @@
},
"allow_subproduct_substitution": {
"type": "boolean",
"description": "`rue` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
"description": "`rue` when any in stock sub product should be used when the given product is a parent product and currently not in stock"
}
},
"example": {

14
localization/strings.pot
View File

@ -1627,7 +1627,7 @@ msgstr ""
msgid "Edit Barcode"
msgstr ""
msgid "Based on the prices of the default consume rule (Opened first, then first due first, then first in first out) for in-stock ingredients and on the last price for missing ones"
msgid "Based on the prices of the default consume rule (Opened first, then first due first, then first in first out) for in stock ingredients and on the last price for missing ones"
msgstr ""
msgid "Clear filter"
@ -1783,7 +1783,7 @@ msgstr ""
msgid "Show a warning when the due date of the purchased product is earlier than the next due date in stock"
msgstr ""
msgid "This is due earlier than already in-stock items"
msgid "This is due earlier than already in stock items"
msgstr ""
msgid "When enabled, after changing/scanning a product and if all fields could be automatically populated (by product and/or barcode defaults), the transaction is automatically submitted"
@ -1994,7 +1994,7 @@ msgstr ""
msgid "Link"
msgstr ""
msgid "The stock overview page lists all products which are currently in-stock or below their min. stock amount - enable this to hide this product there always"
msgid "The stock overview page lists all products which are currently in stock or below their min. stock amount - enable this to hide this product there always"
msgstr ""
msgid "Print options"
@ -2063,7 +2063,7 @@ msgstr ""
msgid "Only done items"
msgstr ""
msgid "Show only in-stock products"
msgid "Show only in stock products"
msgstr ""
msgid "Product description"
@ -2085,7 +2085,7 @@ msgstr ""
msgid "When enabled, then this field must be filled on the destination form"
msgstr ""
msgid "In-stock products"
msgid "In stock products"
msgstr ""
msgid "Timestamp"
@ -2412,7 +2412,7 @@ msgstr ""
msgid "Stock report"
msgstr ""
msgid "Out-of-stock products"
msgid "Out of stock products"
msgstr ""
msgid "Quantity unit for prices"
@ -2450,7 +2450,7 @@ msgstr ""
msgid "Show all out of stock products"
msgstr ""
msgid "By default the stock overview page lists all products which are currently in-stock or below their min. stock amount - when this is enabled, all (active) products are always shown"
msgid "By default the stock overview page lists all products which are currently in stock or below their min. stock amount - when this is enabled, all (active) products are always shown"
msgstr ""
msgid "No price information is available for at least one ingredient"

4
migrations/0181.sql
View File

@ -2,11 +2,11 @@ CREATE VIEW products_current_substitutions
AS
/*
When a parent product is not in-stock itself,
When a parent product is not in stock itself,
any sub product (the next based on the default consume rule) should be used
This view lists all parent products and in the column "product_id_effective" either itself,
when the corresponding parent product is currently in-stock itself, or otherwise the next sub product to use
when the corresponding parent product is currently in stock itself, or otherwise the next sub product to use
*/
SELECT

4
migrations/0200.sql
View File

@ -58,11 +58,11 @@ CREATE VIEW products_current_substitutions
AS
/*
When a parent product is not in-stock itself,
When a parent product is not in stock itself,
any sub product (the next based on the default consume rule) should be used
This view lists all parent products and in the column "product_id_effective" either itself,
when the corresponding parent product is currently in-stock itself, or otherwise the next sub product to use
when the corresponding parent product is currently in stock itself, or otherwise the next sub product to use
*/
SELECT

2
public/viewjs/components/productpicker.js
View File

@ -300,7 +300,7 @@ $('#product_id_text_input').on('blur', function(e)
};
}
// The product picker contains only in-stock products on some pages,
// The product picker contains only in stock products on some pages,
// so only show the workflow dialog when the entered input
// does not match in existing product (name) or barcode,
// otherwise an error validation message that the product is not in stock

2
public/viewjs/purchase.js
View File

@ -193,7 +193,7 @@ $('#save-purchase-button').on('click', function(e)
{
if (moment(jsonData.best_before_date).isBefore(CurrentProductDetails.next_due_date))
{
toastr.warning(__t("This is due earlier than already in-stock items"));
toastr.warning(__t("This is due earlier than already in stock items"));
}
}

2
views/locationcontentsheet.blade.php
View File

@ -43,7 +43,7 @@
checked>
<label class="form-check-label custom-control-label"
for="include-out-of-stock">
{{ $__t('Show only in-stock products') }}
{{ $__t('Show only in stock products') }}
<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"

5
views/productform.blade.php
View File

@ -158,8 +158,7 @@
for="move_on_open">{{ $__t('Move on open') }}&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t("When enabled, on marking this product as opened, the corresponding amount will be moved to the default consume location")
}}"></i>
title="{{$__t("When enabled, on marking this product as opened, the corresponding amount will be moved to the default consume location")}}"></i>
</label>
</div>
@endif
@ -585,7 +584,7 @@
for="hide_on_stock_overview">{{ $__t('Never show on stock overview') }}&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t('The stock overview page lists all products which are currently in-stock or below their min. stock amount - enable this to hide this product there always') }}"></i>
title="{{ $__t('The stock overview page lists all products which are currently in stock or below their min. stock amount - enable this to hide this product there always') }}"></i>
</label>
</div>
</div>

4
views/products.blade.php
View File

@ -79,8 +79,8 @@
<select class="custom-control custom-select"
id="status-filter">
<option value="all">{{ $__t('All') }}</option>
<option value="in-stock">{{ $__t('In-stock products') }}</option>
<option value="out-of-stock">{{ $__t('Out-of-stock products') }}</option>
<option value="in-stock">{{ $__t('In stock products') }}</option>
<option value="out-of-stock">{{ $__t('Out of stock products') }}</option>
</select>
</div>
</div>

2
views/recipes.blade.php
View File

@ -422,7 +422,7 @@
<i class="fa-solid fa-question-circle text-muted d-print-none"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t('Based on the prices of the default consume rule (Opened first, then first due first, then first in first out) for in-stock ingredients and on the last price for missing ones') }}"></i>
title="{{ $__t('Based on the prices of the default consume rule (Opened first, then first due first, then first in first out) for in stock ingredients and on the last price for missing ones') }}"></i>
</label>
<h3>
<span class="locale-number locale-number-currency pt-0">{{ $costs }}</span>

2
views/stockoverview.blade.php
View File

@ -147,7 +147,7 @@
<option value="expired">{{ $__t('Expired') }}</option>
@endif
<option value="belowminstockamount">{{ $__t('Below min. stock amount') }}</option>
<option value="instockX">{{ $__t('In-stock products') }}</option>
<option value="instockX">{{ $__t('In stock products') }}</option>
</select>
</div>
</div>

2
views/stocksettings.blade.php
View File

@ -125,7 +125,7 @@
<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t('By default the stock overview page lists all products which are currently in-stock or below their min. stock amount - when this is enabled, all (active) products are always shown') }}"></i>
title="{{ $__t('By default the stock overview page lists all products which are currently in stock or below their min. stock amount - when this is enabled, all (active) products are always shown') }}"></i>
</label>
</div>
</div>