2
0
mirror of https://github.com/inventree/inventree-app.git synced 2025-04-28 05:26:47 +00:00

Merge remote-tracking branch 'origin/master' into stock-item-delete

This commit is contained in:
Oliver Walters 2022-03-26 19:04:48 +11:00
commit d780a1faa1
3 changed files with 17 additions and 2 deletions

View File

@ -230,6 +230,8 @@ class InvenTreeStockItem extends InvenTreeModel {
int get trackingItemCount => (jsondata["tracking_items"] ?? 0) as int;
bool get isBuilding => (jsondata["is_building"] ?? false) as bool;
// Date of last update
DateTime? get updatedDate {
if (jsondata.containsKey("updated")) {

@ -1 +1 @@
Subproject commit a97cbdd84d2114227add24970cfd5a4d3a5c5f2c
Subproject commit 77fe28ffc72f4be027751027016c1cf7a722af05

View File

@ -735,7 +735,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
});
}
},
)
),
);
} else {
tiles.add(
@ -747,6 +747,19 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
);
}
if (item.isBuilding) {
tiles.add(
ListTile(
title: Text(L10().inProduction),
leading: FaIcon(FontAwesomeIcons.tools),
subtitle: Text(L10().inProductionDetail),
onTap: () {
// TODO: Click through to the "build order"
},
)
);
}
if (item.batch.isNotEmpty) {
tiles.add(
ListTile(