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 1520 additions and 1298 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

InvenTree

InvenTree

urls.py

company

templates

company

assigned_stock.htmldetail_part.htmlpurchase_orders.htmlsales_orders.html

locale

de

LC_MESSAGES

django.modjango.po

en

LC_MESSAGES

django.po

es

LC_MESSAGES

django.po

order

templates

order

sales_orders.html

part

api.py

migrations

0052_auto_20201027_1557.py

models.py

templates

part

allocation.htmlbom.htmlcategory.htmlorders.htmlparams.htmlsupplier.htmlused_in.html

views.py

stock

templates

stock

item.htmlitem_tests.html

templates

attachment_table.html

js

bom.jstable_filters.js

stock_table.html

BIN

InvenTree/locale/de/LC_MESSAGES/django.mo

Binary file not shown.

948

InvenTree/locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff

743

InvenTree/locale/en/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff

743

InvenTree/locale/es/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff