inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-11 07:24:15 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into build-fixes

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/urls.py
#	InvenTree/locale/de/LC_MESSAGES/django.mo
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/part/templates/part/bom.html
#	InvenTree/templates/js/build.js
#	InvenTree/templates/js/table_filters.js
#	InvenTree/templates/stock_table.html
#	tasks.py
This commit is contained in:
Oliver Walters
2020-10-28 22:24:09 +11:00
parent 3ec2396ec1 c8ec55a5fe
commit d06b4d7c9f
27 changed files with 1507 additions and 1285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/models.py
View File

@ -576,7 +576,7 @@ class Part(MPTTModel):
revision = models.CharField(max_length=100, blank=True, null=True, help_text=_('Part revision or version number'))
link = InvenTreeURLField(blank=True, null=True, help_text=_('Link to extenal URL'))
link = InvenTreeURLField(blank=True, null=True, help_text=_('Link to external URL'))
image = StdImageField(
upload_to=rename_part_image,