From aeb9dfe37179efc173206d9178fa1e1622f00282 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 1 Mar 2022 23:58:30 +1100 Subject: [PATCH 1/2] Allows deletion of serialized stock --- InvenTree/stock/models.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 64b47da6d3..14132d297b 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -909,7 +909,6 @@ class StockItem(MPTTModel): """ Can this stock item be deleted? It can NOT be deleted under the following circumstances: - Has installed stock items - - Has a serial number and is tracked - Is installed inside another StockItem - It has been assigned to a SalesOrder - It has been assigned to a BuildOrder @@ -918,9 +917,6 @@ class StockItem(MPTTModel): if self.installed_item_count() > 0: return False - if self.part.trackable and self.serial is not None: - return False - if self.sales_order is not None: return False From f6b3760bb5d5025f5a974ef9985f31c078035261 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 2 Mar 2022 00:05:02 +1100 Subject: [PATCH 2/2] Make UI elements more consistent Ref: https://github.com/inventree/InvenTree/issues/2692 --- InvenTree/part/templates/part/part_base.html | 4 ++-- InvenTree/stock/templates/stock/item_base.html | 2 +- InvenTree/templates/stock_table.html | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 823bb1a4f3..fe18c68a38 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -59,13 +59,13 @@