diff --git a/server/controllers/finance/reports/vouchers/receipt.handlebars b/server/controllers/finance/reports/vouchers/receipt.handlebars index 28948dcc7c..0859ad3afb 100644 --- a/server/controllers/finance/reports/vouchers/receipt.handlebars +++ b/server/controllers/finance/reports/vouchers/receipt.handlebars @@ -10,7 +10,6 @@ {{/if}} {{/header}} - QQQ1
diff --git a/server/controllers/stock/reports/stock/inventories_report.js b/server/controllers/stock/reports/stock/inventories_report.js index ea14423101..7ee1cbd31b 100644 --- a/server/controllers/stock/reports/stock/inventories_report.js +++ b/server/controllers/stock/reports/stock/inventories_report.js @@ -1,5 +1,5 @@ const { - _, ReportManager, formatFilters, Stock, STOCK_INVENTORIES_REPORT_TEMPLATE, stockStatusLabelKeys, + _, db, ReportManager, formatFilters, Stock, STOCK_INVENTORIES_REPORT_TEMPLATE, stockStatusLabelKeys, } = require('../common'); const i18n = require('../../../../lib/helpers/translate'); @@ -31,6 +31,20 @@ async function stockInventoriesReport(req, res, next) { const filters = formatFilters(options); + // Update the name for the depot filter if specified + const depotFilter = filters.find(filt => filt.field === 'depot_uuid'); + if (depotFilter) { + const depot = await db.one('SELECT text FROM depot WHERE uuid = ?', db.bid(depotFilter.value)); + depotFilter.value = depot.text; + } + + // Update the name for the inventory filter if specified + const inventoryFilter = filters.find(filt => filt.field === 'inventory_uuid'); + if (inventoryFilter) { + const inventory = await db.one('SELECT text FROM inventory WHERE uuid = ?', db.bid(inventoryFilter.value)); + inventoryFilter.value = inventory.text; + } + if (req.session.stock_settings.enable_strict_depot_permission) { options.check_user_id = req.session.user.id; } diff --git a/server/controllers/stock/reports/stock_inventories.report.handlebars b/server/controllers/stock/reports/stock_inventories.report.handlebars index 59d9b4a766..2b49c51872 100644 --- a/server/controllers/stock/reports/stock_inventories.report.handlebars +++ b/server/controllers/stock/reports/stock_inventories.report.handlebars @@ -28,12 +28,12 @@ {{#each depots as | items name |}} - - + + {{ name }} - + ({{ items.length }} {{ translate "TABLE.AGGREGATES.RECORDS" }}) @@ -60,8 +60,6 @@ {{S_MAX}} {{S_Q}} - {{else }} - {{> emptyTable columns=11}} {{/each}} @@ -72,6 +70,8 @@ {{/unless}} + {{else}} + {{> emptyTable columns=11}} {{/each}}