From ba0780e26534dc45d642e51cdca615ed89f9b444 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Fri, 22 May 2020 23:27:17 +1000 Subject: [PATCH] Stuff? --- android/app/build.gradle | 5 +++-- lib/inventree/stock.dart | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b4fad3b1..869b98b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,11 +38,12 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "inventree.inventree_app" - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion 20 + targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + multiDexEnabled true } buildTypes { diff --git a/lib/inventree/stock.dart b/lib/inventree/stock.dart index a4c829fb..1e3da8f4 100644 --- a/lib/inventree/stock.dart +++ b/lib/inventree/stock.dart @@ -25,6 +25,18 @@ class InvenTreeStockItem extends InvenTreeModel { return headers; } + @override + Map defaultListFilters() { + + var headers = new Map(); + + headers["part_detail"] = "true"; + headers["location_detail"] = "true"; + headers["supplier_detail"] = "true"; + + return headers; + } + InvenTreeStockItem() : super(); InvenTreeStockItem.fromJson(Map json) : super.fromJson(json) { @@ -44,10 +56,6 @@ class InvenTreeStockItem extends InvenTreeModel { nm = jsondata['part_detail']['full_name'] ?? ''; } - if (nm.isEmpty) { - nm = jsondata['part__name'] ?? ''; - } - return nm; }