style + merge fix

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

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!')
+        raise NotImplementedError('This function needs to be overridden!')