mirror of
https://github.com/inventree/inventree-app.git
synced 2025-04-29 14:06:47 +00:00
Merge remote-tracking branch 'origin/master' into stock-item-delete
This commit is contained in:
commit
d780a1faa1
@ -230,6 +230,8 @@ class InvenTreeStockItem extends InvenTreeModel {
|
|||||||
|
|
||||||
int get trackingItemCount => (jsondata["tracking_items"] ?? 0) as int;
|
int get trackingItemCount => (jsondata["tracking_items"] ?? 0) as int;
|
||||||
|
|
||||||
|
bool get isBuilding => (jsondata["is_building"] ?? false) as bool;
|
||||||
|
|
||||||
// Date of last update
|
// Date of last update
|
||||||
DateTime? get updatedDate {
|
DateTime? get updatedDate {
|
||||||
if (jsondata.containsKey("updated")) {
|
if (jsondata.containsKey("updated")) {
|
||||||
|
2
lib/l10n
2
lib/l10n
@ -1 +1 @@
|
|||||||
Subproject commit a97cbdd84d2114227add24970cfd5a4d3a5c5f2c
|
Subproject commit 77fe28ffc72f4be027751027016c1cf7a722af05
|
@ -735,7 +735,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
tiles.add(
|
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) {
|
if (item.batch.isNotEmpty) {
|
||||||
tiles.add(
|
tiles.add(
|
||||||
ListTile(
|
ListTile(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user