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

PEP fixes

Browse Source
This commit is contained in:
Oliver Walters 2020-04-26 16:44:35 +10:00
parent e768ada83b
commit 3c5ba75d27
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/build/models.py
View File

@ -265,6 +265,9 @@ class Build(MPTTModel):
for build_item in self.allocated_stock.all().prefetch_related('stock_item'): for build_item in self.allocated_stock.all().prefetch_related('stock_item'):
build_item.complete_allocation(user) build_item.complete_allocation(user)
# TODO - Remove the builditem from the database
# build_item.delete()
notes = 'Built {q} on {now}'.format( notes = 'Built {q} on {now}'.format(
q=self.quantity, q=self.quantity,
now=str(datetime.now().date()) now=str(datetime.now().date())

3
InvenTree/order/models.py
View File

@ -324,6 +324,9 @@ class SalesOrder(Order):
for allocation in line.allocations.all(): for allocation in line.allocations.all():
allocation.complete_allocation(user) allocation.complete_allocation(user)
# TODO - Remove the allocation from the database
# allocation.delete()
# Ensure the order status is marked as "Shipped" # Ensure the order status is marked as "Shipped"
self.status = SalesOrderStatus.SHIPPED self.status = SalesOrderStatus.SHIPPED
self.shipment_date = datetime.now().date() self.shipment_date = datetime.now().date()

2
InvenTree/stock/admin.py
View File

@ -12,7 +12,7 @@ from .models import StockLocation, StockItem
from .models import StockItemTracking from .models import StockItemTracking
from build.models import Build from build.models import Build
from company.models import Company, SupplierPart from company.models import SupplierPart
from order.models import PurchaseOrder, SalesOrder from order.models import PurchaseOrder, SalesOrder
from part.models import Part from part.models import Part

23
InvenTree/stock/templates/stock/item_base.html
View File

@ -15,16 +15,6 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
{% block pre_content %} {% block pre_content %}
{% include 'stock/loc_link.html' with location=item.location %} {% include 'stock/loc_link.html' with location=item.location %}
{% if item.sales_order %}
<div class='alert alert-block alert-info'>
{% trans "This stock item was assigned to" %} <b><a href="{% url 'so-detail' item.sales_order.id %}"> {% trans "Sales Order" %} {{ item.sales_order.id }}</a></b>
</div>
{% elif item.build_order %}
<div class='alert alert-block alert-info'>
{% trans "This stock item was assigned to" %}<b><a href="{% url 'build-detail' item.build_order.id %}"> {% trans "Build Order" %} #{{ item.build_order.id }}</a></b>
</div>
{% else %}
{% for allocation in item.sales_order_allocations.all %} {% for allocation in item.sales_order_allocations.all %}
<div class='alert alert-block alert-info'> <div class='alert alert-block alert-info'>
{% trans "This stock item is allocated to Sales Order" %} <a href="{% url 'so-detail' allocation.line.order.id %}"><b>#{{ allocation.line.order.reference }}</b></a> ({% trans "Quantity" %}: {% decimal allocation.quantity %}) {% trans "This stock item is allocated to Sales Order" %} <a href="{% url 'so-detail' allocation.line.order.id %}"><b>#{{ allocation.line.order.reference }}</b></a> ({% trans "Quantity" %}: {% decimal allocation.quantity %})
@ -36,7 +26,6 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
{% trans "This stock item is allocated to Build" %} <a href="{% url 'build-detail' allocation.build.id %}"><b>#{{ allocation.build.id }}</b></a> ({% trans "Quantity" %}: {% decimal allocation.quantity %}) {% trans "This stock item is allocated to Build" %} <a href="{% url 'build-detail' allocation.build.id %}"><b>#{{ allocation.build.id }}</b></a> ({% trans "Quantity" %}: {% decimal allocation.quantity %})
</div> </div>
{% endfor %} {% endfor %}
{% endif %}
{% if item.serialized %} {% if item.serialized %}
<div class='alert alert-block alert-warning'> <div class='alert alert-block alert-warning'>
@ -62,13 +51,13 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
<h3> <h3>
{% trans "Stock Item" %} {% trans "Stock Item" %}
{% if item.sales_order %} {% if item.sales_order %}
<div class='label label-large label-large-blue'> <a href="{% url 'so-detail' item.sales_order.id %}">
{% trans "Sold" $} <div class='label label-large label-large-blue'>{% trans "Sold" $}</div>
</div> </a>
{% elif item.build_order %} {% elif item.build_order %}
<div class='label label-large label-large-blue'> <a href="{% url 'build-detail' item.build_order.id %}">
{% trans "Used in Build" %} <div class='label label-large label-large-blue'>{% trans "Used in Build" %}</div>
</div> </a>
{% elif item.status in StockStatus.UNAVAILABLE_CODES %}{% stock_status_label item.status large=True %} {% elif item.status in StockStatus.UNAVAILABLE_CODES %}{% stock_status_label item.status large=True %}
{% endif %} {% endif %}
</h3> </h3>