Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1131 from SchrodingersGat/purchase-price-fix

Browse Source 
Fix for StockItem creation form
This commit is contained in:
Oliver 2020-11-17 16:07:31 +11:00 committed by GitHub
commit 4daf291619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 110 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
InvenTree/InvenTree/views.py
View File

@ -388,14 +388,15 @@ class AjaxCreateView(AjaxMixin, CreateView):
# Save the object to the database
self.object = self.save(self.form)
# Return the PK of the newly-created object
data['pk'] = self.object.pk
data['text'] = str(self.object)
if self.object:
# Return the PK of the newly-created object
data['pk'] = self.object.pk
data['text'] = str(self.object)
try:
data['url'] = self.object.get_absolute_url()
except AttributeError:
pass
try:
data['url'] = self.object.get_absolute_url()
except AttributeError:
pass
return self.renderJsonResponse(request, self.form, data)

2
InvenTree/stock/forms.py
View File

@ -124,11 +124,11 @@ class CreateStockItemForm(HelperForm):
fields = [
'part',
'supplier_part',
'purchase_price',
'location',
'quantity',
'batch',
'serial_numbers',
'purchase_price',
'link',
'delete_on_deplete',
'status',

19
InvenTree/stock/migrations/0055_auto_20201117_1453.py Normal file
View File

@ -0,0 +1,19 @@
# Generated by Django 3.0.7 on 2020-11-17 03:53
from django.db import migrations
import djmoney.models.fields
class Migration(migrations.Migration):
dependencies = [
('stock', '0054_remove_stockitem_build_order'),
]
operations = [
migrations.AlterField(
model_name='stockitem',
name='purchase_price',
field=djmoney.models.fields.MoneyField(blank=True, decimal_places=4, default_currency='USD', help_text='Single unit purchase price at time of purchase', max_digits=19, null=True, verbose_name='Purchase Price'),
),
]

1
InvenTree/stock/models.py
View File

@ -453,6 +453,7 @@ class StockItem(MPTTModel):
max_digits=19,
decimal_places=4,
default_currency='USD',
blank=True,
null=True,
verbose_name=_('Purchase Price'),
help_text=_('Single unit purchase price at time of purchase'),

184
InvenTree/stock/views.py
View File

@ -1607,127 +1607,101 @@ class StockItemCreate(AjaxCreateView):
return initials
def post(self, request, *args, **kwargs):
""" Handle POST of StockItemCreate form.
- Manage serial-number valdiation for tracked parts
def validate(self, item, form):
"""
Extra form validation steps
"""
part = None
data = form.cleaned_data
form = self.get_form()
part = data['part']
data = {}
quantity = data.get('quantity', None)
valid = form.is_valid()
if not quantity:
return
if valid:
part_id = form['part'].value()
try:
part = Part.objects.get(id=part_id)
quantity = Decimal(form['quantity'].value())
try:
quantity = Decimal(quantity)
except (ValueError, InvalidOperation):
form.add_error('quantity', _('Invalid quantity provided'))
return
except (Part.DoesNotExist, ValueError, InvalidOperation):
part = None
quantity = 1
valid = False
form.add_error('quantity', _('Invalid quantity'))
if quantity < 0:
form.add_error('quantity', _('Quantity cannot be negative'))
if quantity < 0:
form.add_error('quantity', _('Quantity cannot be less than zero'))
valid = False
# Trackable parts are treated differently
if part.trackable:
sn = data.get('serial_numbers', '')
sn = str(sn).strip()
if part is None:
form.add_error('part', _('Invalid part selection'))
if len(sn) > 0:
serials = extract_serial_numbers(sn, quantity)
existing = part.find_conflicting_serial_numbers(serials)
if len(existing) > 0:
exists = ','.join([str(x) for x in existing])
form.add_error(
'serial_numbers',
_('Serial numbers already exist') + ': ' + exists
)
def save(self, form, **kwargs):
"""
Create a new StockItem based on the provided form data.
"""
data = form.cleaned_data
part = data['part']
quantity = data['quantity']
if part.trackable:
sn = data.get('serial_numbers', '')
sn = str(sn).strip()
# Create a single stock item for each provided serial number
if len(sn) > 0:
serials = extract_serial_numbers(sn, quantity)
for serial in serials:
item = StockItem(
part=part,
quantity=1,
serial=serial,
supplier_part=data.get('supplier_part', None),
location=data.get('location', None),
batch=data.get('batch', None),
delete_on_deplete=False,
status=data.get('status'),
link=data.get('link', ''),
)
item.save(user=self.request.user)
# Create a single StockItem of the specified quantity
else:
# A trackable part must provide serial numbesr
if part.trackable:
sn = request.POST.get('serial_numbers', '')
form._post_clean()
sn = str(sn).strip()
item = form.save(commit=False)
item.user = self.request.user
item.save()
# If user has specified a range of serial numbers
if len(sn) > 0:
try:
serials = extract_serial_numbers(sn, quantity)
return item
existing = part.find_conflicting_serial_numbers(serials)
# Non-trackable part
else:
if len(existing) > 0:
exists = ",".join([str(x) for x in existing])
form.add_error(
'serial_numbers',
_('Serial numbers already exist') + ': ' + exists
)
valid = False
form._post_clean()
else:
# At this point we have a list of serial numbers which we know are valid,
# and do not currently exist
form.clean()
item = form.save(commit=False)
item.user = self.request.user
item.save()
form_data = form.cleaned_data
if form.is_valid():
for serial in serials:
# Create a new stock item for each serial number
item = StockItem(
part=part,
quantity=1,
serial=serial,
supplier_part=form_data.get('supplier_part'),
location=form_data.get('location'),
batch=form_data.get('batch'),
delete_on_deplete=False,
status=form_data.get('status'),
link=form_data.get('link'),
)
item.save(user=request.user)
data['success'] = _('Created {n} new stock items'.format(n=len(serials)))
valid = True
except ValidationError as e:
form.add_error('serial_numbers', e.messages)
valid = False
else:
# We have a serialized part, but no serial numbers specified...
form.clean()
form._post_clean()
if form.is_valid():
item = form.save(commit=False)
item.save(user=request.user)
data['pk'] = item.pk
data['url'] = item.get_absolute_url()
data['success'] = _("Created new stock item")
valid = True
else: # Referenced Part object is not marked as "trackable"
# For non-serialized items, simply save the form.
# We need to call _post_clean() here because it is prevented in the form implementation
form.clean()
form._post_clean()
if form.is_valid:
item = form.save(commit=False)
item.save(user=request.user)
data['pk'] = item.pk
data['url'] = item.get_absolute_url()
data['success'] = _("Created new stock item")
valid = True
data['form_valid'] = valid and form.is_valid()
return self.renderJsonResponse(request, form, data=data)
return item
class StockLocationDelete(AjaxDeleteView):