inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00
Code

Peppy fixes

Browse Source
This commit is contained in:
Oliver Walters 2019-06-15 19:42:09 +10:00
parent 1290e7f289
commit 3405fb93a9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/order/models.py
View File

@ -112,7 +112,8 @@ class PurchaseOrder(Order):
help_text=_('Company') help_text=_('Company')
) )
received_by = models.ForeignKey(User, received_by = models.ForeignKey(
User,
on_delete=models.SET_NULL, on_delete=models.SET_NULL,
blank=True, null=True, blank=True, null=True,
related_name='+' related_name='+'
@ -242,7 +243,6 @@ class PurchaseOrder(Order):
po=str(self)) po=str(self))
) )
# Update the number of parts received against the particular line item # Update the number of parts received against the particular line item
line.received += quantity line.received += quantity
line.save() line.save()
@ -313,4 +313,4 @@ class PurchaseOrderLineItem(OrderLineItem):
def remaining(self): def remaining(self):
""" Calculate the number of items remaining to be received """ """ Calculate the number of items remaining to be received """
r = self.quantity - self.received r = self.quantity - self.received
return max(r, 0) return max(r, 0)

3
InvenTree/order/views.py
View File

@ -5,7 +5,6 @@ Django views for interacting with Order app
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import transaction
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.views.generic import DetailView, ListView from django.views.generic import DetailView, ListView
@ -252,7 +251,7 @@ class PurchaseOrderReceive(AjaxView):
receive = int(receive) receive = int(receive)
except ValueError: except ValueError:
# In the case on an invalid input, reset to default # In the case on an invalid input, reset to default
receive = line.remaining() receive = line.remaining()
errors = True errors = True
if receive < 0: if receive < 0:

2
InvenTree/stock/models.py
View File

@ -251,7 +251,7 @@ class StockItem(models.Model):
updated = models.DateField(auto_now=True, null=True) updated = models.DateField(auto_now=True, null=True)
purchase_order = models.ForeignKey( purchase_order = models.ForeignKey(
'order.PurchaseOrder', 'order.PurchaseOrder',
on_delete=models.SET_NULL, on_delete=models.SET_NULL,
related_name='stock_items', related_name='stock_items',
blank=True, null=True, blank=True, null=True,