From 9d5b90190b3f19d84e966c2ddc0891e4c10f75fe Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 26 May 2021 13:18:07 +0200 Subject: [PATCH] style + merge fix --- InvenTree/common/forms.py | 3 ++- InvenTree/common/views.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/InvenTree/common/forms.py b/InvenTree/common/forms.py index 7160c1b219..3ce83ac72f 100644 --- a/InvenTree/common/forms.py +++ b/InvenTree/common/forms.py @@ -5,11 +5,12 @@ Django forms for interacting with common objects # -*- coding: utf-8 -*- from __future__ import unicode_literals +from decimal import Decimal, InvalidOperation + from django import forms from django.utils.translation import gettext as _ from InvenTree.forms import HelperForm -from InvenTree.helpers import clean_decimal from .files import FileManager from .models import InvenTreeSetting diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py index a2335447cf..bd1fb6421b 100644 --- a/InvenTree/common/views.py +++ b/InvenTree/common/views.py @@ -607,4 +607,4 @@ class FileManagementAjaxView(AjaxView): self.ajax_form_title = self.form_steps_description[self.get_step_index()] def validate(self, obj, form, **kwargs): - raise NotImplementedError('This function needs to be overridden!') \ No newline at end of file + raise NotImplementedError('This function needs to be overridden!')