inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-03 22:55:43 +00:00
Code Activity

Various style fixes (#5797)

Browse Source 
* removed unused imports

* use f-string where applicable

* string format changes
This commit is contained in:
Matthias Mair
2023-10-27 00:06:48 +02:00
committed by GitHub
parent 82b376de5b
commit 20d1fa847e
29 changed files with 53 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/stock/api.py
View File

@@ -847,10 +847,7 @@ class StockList(APIDownloadMixin, ListCreateDestroyAPIView):
filedata = dataset.export(export_format)
filename = 'InvenTree_StockItems_{date}.{fmt}'.format(
date=datetime.now().strftime("%d-%b-%Y"),
fmt=export_format
)
filename = f'InvenTree_StockItems_{datetime.now().strftime("%d-%b-%Y")}.{export_format}'
return DownloadFile(filedata, filename)

22
InvenTree/stock/models.py
View File

@@ -662,9 +662,7 @@ class StockItem(InvenTreeBarcodeMixin, InvenTreeNotesMixin, MetadataMixin, commo
try:
if self.supplier_part is not None:
if self.supplier_part.part != self.part:
raise ValidationError({'supplier_part': _("Part type ('{pf}') must be {pe}").format(
pf=str(self.supplier_part.part),
pe=str(self.part))
raise ValidationError({'supplier_part': _(f"Part type ('{self.supplier_part.part}') must be {self.part}")
})
if self.part is not None:
@@ -1451,7 +1449,7 @@ class StockItem(InvenTreeBarcodeMixin, InvenTreeNotesMixin, MetadataMixin, commo
raise ValidationError({"quantity": _("Quantity must be greater than zero")})
if quantity > self.quantity:
raise ValidationError({"quantity": _("Quantity must not exceed available stock quantity ({n})").format(n=self.quantity)})
raise ValidationError({"quantity": _(f"Quantity must not exceed available stock quantity ({self.quantity})")})
if type(serials) not in [list, tuple]:
raise ValidationError({"serial_numbers": _("Serial numbers must be a list of integers")})
@@ -1950,21 +1948,15 @@ class StockItem(InvenTreeBarcodeMixin, InvenTreeNotesMixin, MetadataMixin, commo
def __str__(self):
"""Human friendly name."""
if self.part.trackable and self.serial:
s = '{part} #{sn}'.format(
part=self.part.full_name,
sn=self.serial)
s = f'{self.part.full_name} #{self.serial}'
else:
s = '{n} x {part}'.format(
n=InvenTree.helpers.decimal2string(self.quantity),
part=self.part.full_name)
s = f'{InvenTree.helpers.decimal2string(self.quantity)} x {self.part.full_name}'
if self.location:
s += ' @ {loc}'.format(loc=self.location.name)
s += f' @ {self.location.name}'
if self.purchase_order:
s += " ({po})".format(
po=self.purchase_order,
)
s += f" ({self.purchase_order})"
return s
@@ -2227,7 +2219,7 @@ class StockItemTracking(models.Model):
def get_absolute_url(self):
"""Return url for instance."""
return '/stock/track/{pk}'.format(pk=self.id)
return f'/stock/track/{self.id}'
def label(self):
"""Return label."""