inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-14 19:15:41 +00:00
Code Activity

Merge remote-tracking branch 'upstream/master' into django-q

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
This commit is contained in:
Oliver Walters
2021-04-07 22:29:47 +10:00
parent 4a3ca4638c 5e0e364b6c
commit 9c38d67b52
76 changed files with 4616 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/common/models.py
View File

@ -17,7 +17,7 @@ from djmoney.models.fields import MoneyField
from djmoney.contrib.exchange.models import convert_money
from djmoney.contrib.exchange.exceptions import MissingRate
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy as _
from django.core.validators import MinValueValidator, URLValidator
from django.core.exceptions import ValidationError

2
InvenTree/common/views.py
View File

@ -5,7 +5,7 @@ Django views for interacting with common models
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy as _
from django.forms import CheckboxInput, Select
from InvenTree.views import AjaxUpdateView