Merge branch 'master' into create-part

This commit is contained in:
Oliver committed 2021-08-10 08:14:44 +10:00
commit 92a7a73408
21 files changed
+316 -54

No files matched your search

+8 -4
View File
@@ -220,6 +220,10 @@ class InvenTreeStockItem extends InvenTreeModel {
int get status => jsondata['status'] ?? -1;
String get packaging => jsondata["packaging"] ?? "";
String get batch => jsondata["batch"] ?? "";
int get partId => jsondata['part'] ?? -1;
String get purchasePrice => jsondata['purchase_price'] ?? "";
@@ -242,11 +246,11 @@ class InvenTreeStockItem extends InvenTreeModel {
}
}
String? get updatedDateString {
String get updatedDateString {
var _updated = updatedDate;
if (_updated == null) {
return null;
return "";
}
final DateFormat _format = DateFormat("yyyy-MM-dd");
@@ -262,11 +266,11 @@ class InvenTreeStockItem extends InvenTreeModel {
}
}
String? get stocktakeDateString {
String get stocktakeDateString {
var _stocktake = stocktakeDate;
if (_stocktake == null) {
return null;
return "";
}
final DateFormat _format = DateFormat("yyyy-MM-dd");