-
Company Details
+Company Details
diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html
index ec6f80c652..5e0a28541c 100644
--- a/InvenTree/company/templates/company/detail_part.html
+++ b/InvenTree/company/templates/company/detail_part.html
@@ -4,7 +4,7 @@
{% include 'company/tabs.html' with tab='parts' %}
-Supplier Parts
+Supplier Parts
-
+
+
+Purchase Orders
+{% include "order/po_table.html" with orders=part.purchase_orders %}
{% endblock %}
diff --git a/InvenTree/company/templates/company/po_list.html b/InvenTree/company/templates/company/po_list.html
new file mode 100644
index 0000000000..8b4204996f
--- /dev/null
+++ b/InvenTree/company/templates/company/po_list.html
@@ -0,0 +1,7 @@
+{% for order in orders %}
+
+ {{ order }}
+ {{ order.description }}
+ {% include "order/order_status.html" with order=order %}
+
+{% endfor %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/tabs.html b/InvenTree/company/templates/company/tabs.html
index 211b56e1d1..e52f22fab2 100644
--- a/InvenTree/company/templates/company/tabs.html
+++ b/InvenTree/company/templates/company/tabs.html
@@ -9,12 +9,10 @@
Stock {{ company.stock_count }}
- {% if 0 %}
- Purchase Orders
+ Purchase Orders {{ company.purchase_orders.count }}
{% endif %}
- {% endif %}
{% if company.is_customer %}
{% if 0 %}
diff --git a/InvenTree/company/urls.py b/InvenTree/company/urls.py
index 7f617baafd..de4a5e7c5f 100644
--- a/InvenTree/company/urls.py
+++ b/InvenTree/company/urls.py
@@ -17,6 +17,7 @@ company_detail_urls = [
url(r'parts/?', views.CompanyDetail.as_view(template_name='company/detail_part.html'), name='company-detail-parts'),
url(r'stock/?', views.CompanyDetail.as_view(template_name='company/detail_stock.html'), name='company-detail-stock'),
+ url(r'purchase-orders/?', views.CompanyDetail.as_view(template_name='company/detail_purchase_orders.html'), name='company-detail-purchase-orders'),
url(r'thumbnail/?', views.CompanyImage.as_view(), name='company-image'),
diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py
index cce518676a..c3cda22e39 100644
--- a/InvenTree/company/views.py
+++ b/InvenTree/company/views.py
@@ -11,6 +11,7 @@ from django.views.generic import DetailView, ListView
from django.forms import HiddenInput
from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView
+from InvenTree.status_codes import OrderStatus
from .models import Company
from .models import SupplierPart
@@ -57,6 +58,12 @@ class CompanyDetail(DetailView):
queryset = Company.objects.all()
model = Company
+ def get_context_data(self, **kwargs):
+ ctx = super().get_context_data(**kwargs)
+ ctx['OrderStatus'] = OrderStatus
+
+ return ctx
+
class CompanyImage(AjaxUpdateView):
""" View for uploading an image for the Company """
@@ -121,6 +128,12 @@ class SupplierPartDetail(DetailView):
context_object_name = 'part'
queryset = SupplierPart.objects.all()
+ def get_context_data(self, **kwargs):
+ ctx = super().get_context_data(**kwargs)
+ ctx['OrderStatus'] = OrderStatus
+
+ return ctx
+
class SupplierPartEdit(AjaxUpdateView):
""" Update view for editing SupplierPart """
diff --git a/InvenTree/order/__init__.py b/InvenTree/order/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/InvenTree/order/admin.py b/InvenTree/order/admin.py
new file mode 100644
index 0000000000..bbd95cd42a
--- /dev/null
+++ b/InvenTree/order/admin.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.contrib import admin
+
+from .models import PurchaseOrder, PurchaseOrderLineItem
+
+
+class PurchaseOrderAdmin(admin.ModelAdmin):
+
+ list_display = (
+ 'reference',
+ 'supplier',
+ 'status',
+ 'description',
+ 'creation_date'
+ )
+
+
+class PurchaseOrderLineItemAdmin(admin.ModelAdmin):
+
+ list_display = (
+ 'order',
+ 'part',
+ 'quantity',
+ 'reference'
+ )
+
+
+admin.site.register(PurchaseOrder, PurchaseOrderAdmin)
+admin.site.register(PurchaseOrderLineItem, PurchaseOrderLineItemAdmin)
diff --git a/InvenTree/order/apps.py b/InvenTree/order/apps.py
new file mode 100644
index 0000000000..821e6d872c
--- /dev/null
+++ b/InvenTree/order/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class OrderConfig(AppConfig):
+ name = 'order'
diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py
new file mode 100644
index 0000000000..08e9a6f740
--- /dev/null
+++ b/InvenTree/order/forms.py
@@ -0,0 +1,51 @@
+"""
+Django Forms for interacting with Order objects
+"""
+
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django import forms
+
+from InvenTree.forms import HelperForm
+
+from .models import PurchaseOrder, PurchaseOrderLineItem
+
+
+class IssuePurchaseOrderForm(HelperForm):
+
+ confirm = forms.BooleanField(required=False, help_text='Place order')
+
+ class Meta:
+ model = PurchaseOrder
+ fields = [
+ 'confirm',
+ ]
+
+
+class EditPurchaseOrderForm(HelperForm):
+ """ Form for editing a PurchaseOrder object """
+
+ class Meta:
+ model = PurchaseOrder
+ fields = [
+ 'reference',
+ 'supplier',
+ 'description',
+ 'URL',
+ 'notes'
+ ]
+
+
+class EditPurchaseOrderLineItemForm(HelperForm):
+ """ Form for editing a PurchaseOrderLineItem object """
+
+ class Meta:
+ model = PurchaseOrderLineItem
+ fields = [
+ 'order',
+ 'part',
+ 'quantity',
+ 'reference',
+ 'received'
+ ]
diff --git a/InvenTree/order/migrations/0001_initial.py b/InvenTree/order/migrations/0001_initial.py
new file mode 100644
index 0000000000..642b321d47
--- /dev/null
+++ b/InvenTree/order/migrations/0001_initial.py
@@ -0,0 +1,48 @@
+# Generated by Django 2.2 on 2019-06-04 12:17
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('company', '0005_auto_20190525_2356'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='PurchaseOrder',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('reference', models.CharField(help_text='Order reference', max_length=64, unique=True)),
+ ('description', models.CharField(help_text='Order description', max_length=250)),
+ ('creation_date', models.DateField(auto_now=True)),
+ ('issue_date', models.DateField(blank=True, null=True)),
+ ('notes', models.TextField(blank=True, help_text='Order notes')),
+ ('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+ ('supplier', models.ForeignKey(help_text='Company', on_delete=django.db.models.deletion.CASCADE, related_name='Orders', to='company.Company')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ migrations.CreateModel(
+ name='PurchaseOrderLineItem',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('quantity', models.PositiveIntegerField(default=1, help_text='Item quantity', validators=[django.core.validators.MinValueValidator(0)])),
+ ('reference', models.CharField(blank=True, help_text='Line item reference', max_length=100)),
+ ('received', models.PositiveIntegerField(default=0, help_text='Number of items received')),
+ ('order', models.ForeignKey(help_text='Purchase Order', on_delete=django.db.models.deletion.CASCADE, related_name='lines', to='order.PurchaseOrder')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0002_auto_20190604_2224.py b/InvenTree/order/migrations/0002_auto_20190604_2224.py
new file mode 100644
index 0000000000..2565eae2a2
--- /dev/null
+++ b/InvenTree/order/migrations/0002_auto_20190604_2224.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.2 on 2019-06-04 12:24
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='purchaseorder',
+ name='URL',
+ field=models.URLField(blank=True, help_text='Link to external page'),
+ ),
+ migrations.AlterField(
+ model_name='purchaseorder',
+ name='description',
+ field=models.CharField(blank=True, help_text='Order description', max_length=250),
+ ),
+ migrations.AlterField(
+ model_name='purchaseorder',
+ name='supplier',
+ field=models.ForeignKey(help_text='Company', limit_choices_to={'is_supplier': True}, on_delete=django.db.models.deletion.CASCADE, related_name='Orders', to='company.Company'),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0003_auto_20190604_2226.py b/InvenTree/order/migrations/0003_auto_20190604_2226.py
new file mode 100644
index 0000000000..612166c2f7
--- /dev/null
+++ b/InvenTree/order/migrations/0003_auto_20190604_2226.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2 on 2019-06-04 12:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0002_auto_20190604_2224'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='purchaseorder',
+ name='supplier',
+ field=models.ForeignKey(help_text='Company', limit_choices_to={'is_supplier': True}, on_delete=django.db.models.deletion.CASCADE, related_name='purchase_orders', to='company.Company'),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0004_purchaseorder_status.py b/InvenTree/order/migrations/0004_purchaseorder_status.py
new file mode 100644
index 0000000000..d1ad90eb38
--- /dev/null
+++ b/InvenTree/order/migrations/0004_purchaseorder_status.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2019-06-04 12:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0003_auto_20190604_2226'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='purchaseorder',
+ name='status',
+ field=models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'Placed'), (30, 'Complete'), (40, 'Cancelled'), (50, 'Lost'), (60, 'Returned')], default=10, help_text='Order status'),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0005_purchaseorderlineitem_part.py b/InvenTree/order/migrations/0005_purchaseorderlineitem_part.py
new file mode 100644
index 0000000000..61f0944156
--- /dev/null
+++ b/InvenTree/order/migrations/0005_purchaseorderlineitem_part.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2 on 2019-06-05 10:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('company', '0005_auto_20190525_2356'),
+ ('order', '0004_purchaseorder_status'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='purchaseorderlineitem',
+ name='part',
+ field=models.ForeignKey(blank=True, help_text='Supplier part', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='orders', to='company.SupplierPart'),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0006_auto_20190605_2056.py b/InvenTree/order/migrations/0006_auto_20190605_2056.py
new file mode 100644
index 0000000000..e938343d01
--- /dev/null
+++ b/InvenTree/order/migrations/0006_auto_20190605_2056.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2019-06-05 10:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('company', '0005_auto_20190525_2356'),
+ ('order', '0005_purchaseorderlineitem_part'),
+ ]
+
+ operations = [
+ migrations.AlterUniqueTogether(
+ name='purchaseorderlineitem',
+ unique_together={('order', 'part')},
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0007_auto_20190605_2138.py b/InvenTree/order/migrations/0007_auto_20190605_2138.py
new file mode 100644
index 0000000000..ce2119f258
--- /dev/null
+++ b/InvenTree/order/migrations/0007_auto_20190605_2138.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2 on 2019-06-05 11:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0006_auto_20190605_2056'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='purchaseorderlineitem',
+ name='part',
+ field=models.ForeignKey(blank=True, help_text='Supplier part', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='order_line_items', to='company.SupplierPart'),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0008_auto_20190605_2140.py b/InvenTree/order/migrations/0008_auto_20190605_2140.py
new file mode 100644
index 0000000000..688c8cf15c
--- /dev/null
+++ b/InvenTree/order/migrations/0008_auto_20190605_2140.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2 on 2019-06-05 11:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0007_auto_20190605_2138'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='purchaseorderlineitem',
+ name='part',
+ field=models.ForeignKey(blank=True, help_text='Supplier part', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='purchase_order_line_items', to='company.SupplierPart'),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/0009_auto_20190606_2133.py b/InvenTree/order/migrations/0009_auto_20190606_2133.py
new file mode 100644
index 0000000000..0cadfe87fe
--- /dev/null
+++ b/InvenTree/order/migrations/0009_auto_20190606_2133.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2019-06-06 11:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('order', '0008_auto_20190605_2140'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='purchaseorder',
+ name='description',
+ field=models.CharField(help_text='Order description', max_length=250),
+ ),
+ ]
diff --git a/InvenTree/order/migrations/__init__.py b/InvenTree/order/migrations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
new file mode 100644
index 0000000000..7ca2e942fd
--- /dev/null
+++ b/InvenTree/order/models.py
@@ -0,0 +1,150 @@
+"""
+Order model definitions
+"""
+
+# -*- coding: utf-8 -*-
+
+from django.db import models
+from django.core.validators import MinValueValidator
+from django.contrib.auth.models import User
+from django.urls import reverse
+from django.utils.translation import ugettext as _
+
+from datetime import datetime
+
+from company.models import Company, SupplierPart
+
+from InvenTree.status_codes import OrderStatus
+
+
+class Order(models.Model):
+ """ Abstract model for an order.
+
+ Instances of this class:
+
+ - PuchaseOrder
+
+ Attributes:
+ reference: Unique order number / reference / code
+ description: Long form description (required)
+ notes: Extra note field (optional)
+ creation_date: Automatic date of order creation
+ created_by: User who created this order (automatically captured)
+ issue_date: Date the order was issued
+
+ """
+
+ ORDER_PREFIX = ""
+
+ def __str__(self):
+ el = []
+
+ if self.ORDER_PREFIX:
+ el.append(self.ORDER_PREFIX)
+
+ el.append(self.reference)
+
+ return " ".join(el)
+
+ class Meta:
+ abstract = True
+
+ reference = models.CharField(unique=True, max_length=64, blank=False, help_text=_('Order reference'))
+
+ description = models.CharField(max_length=250, help_text=_('Order description'))
+
+ URL = models.URLField(blank=True, help_text=_('Link to external page'))
+
+ creation_date = models.DateField(auto_now=True, editable=False)
+
+ status = models.PositiveIntegerField(default=OrderStatus.PENDING, choices=OrderStatus.items(),
+ help_text='Order status')
+
+ created_by = models.ForeignKey(User,
+ on_delete=models.SET_NULL,
+ blank=True, null=True,
+ related_name='+'
+ )
+
+ issue_date = models.DateField(blank=True, null=True)
+
+ notes = models.TextField(blank=True, help_text=_('Order notes'))
+
+ def place_order(self):
+ """ Marks the order as PLACED. Order must be currently PENDING. """
+
+ if self.status == OrderStatus.PENDING:
+ self.status = OrderStatus.PLACED
+ self.issue_date = datetime.now().date()
+ self.save()
+
+
+class PurchaseOrder(Order):
+ """ A PurchaseOrder represents goods shipped inwards from an external supplier.
+
+ Attributes:
+ supplier: Reference to the company supplying the goods in the order
+
+ """
+
+ ORDER_PREFIX = "PO"
+
+ supplier = models.ForeignKey(
+ Company, on_delete=models.CASCADE,
+ limit_choices_to={
+ 'is_supplier': True,
+ },
+ related_name='purchase_orders',
+ help_text=_('Company')
+ )
+
+ def get_absolute_url(self):
+ return reverse('purchase-order-detail', kwargs={'pk': self.id})
+
+
+class OrderLineItem(models.Model):
+ """ Abstract model for an order line item
+
+ Attributes:
+ quantity: Number of items
+ note: Annotation for the item
+
+ """
+
+ class Meta:
+ abstract = True
+
+ quantity = models.PositiveIntegerField(validators=[MinValueValidator(0)], default=1, help_text=_('Item quantity'))
+
+ reference = models.CharField(max_length=100, blank=True, help_text=_('Line item reference'))
+
+
+class PurchaseOrderLineItem(OrderLineItem):
+ """ Model for a purchase order line item.
+
+ Attributes:
+ order: Reference to a PurchaseOrder object
+
+ """
+
+ class Meta:
+ unique_together = (
+ ('order', 'part')
+ )
+
+ order = models.ForeignKey(
+ PurchaseOrder, on_delete=models.CASCADE,
+ related_name='lines',
+ help_text=_('Purchase Order')
+ )
+
+ # TODO - Function callback for when the SupplierPart is deleted?
+
+ part = models.ForeignKey(
+ SupplierPart, on_delete=models.SET_NULL,
+ blank=True, null=True,
+ related_name='purchase_order_line_items',
+ help_text=_("Supplier part"),
+ )
+
+ received = models.PositiveIntegerField(default=0, help_text=_('Number of items received'))
diff --git a/InvenTree/order/templates/order/order_issue.html b/InvenTree/order/templates/order/order_issue.html
new file mode 100644
index 0000000000..ad80fc5a0d
--- /dev/null
+++ b/InvenTree/order/templates/order/order_issue.html
@@ -0,0 +1,7 @@
+{% extends "modal_form.html" %}
+
+{% block pre_form_content %}
+
+After placing this purchase order, line items will no longer be editable.
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/order_status.html b/InvenTree/order/templates/order/order_status.html
new file mode 100644
index 0000000000..c9e13cac24
--- /dev/null
+++ b/InvenTree/order/templates/order/order_status.html
@@ -0,0 +1,13 @@
+{% if order.status == OrderStatus.PENDING %}
+
+{% elif order.status == OrderStatus.PLACED %}
+
+{% elif order.status == OrderStatus.COMPLETE %}
+
+{% elif order.status == OrderStatus.CANCELLED or order.status == OrderStatus.RETURNED %}
+
+{% else %}
+
+{% endif %}
+{{ order.get_status_display }}
+
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/po_table.html b/InvenTree/order/templates/order/po_table.html
new file mode 100644
index 0000000000..0c1149470f
--- /dev/null
+++ b/InvenTree/order/templates/order/po_table.html
@@ -0,0 +1,16 @@
+
+
+ Company
+ Order Reference
+ Description
+ Status
+
+ {% for order in orders %}
+
+ {% include "hover_image.html" with image=order.supplier.image hover=True %}{{ order.supplier.name }}
+ {{ order }}
+ {{ order.description }}
+ {% include "order/order_status.html" %}
+
+ {% endfor %}
+
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/po_table_collapse.html b/InvenTree/order/templates/order/po_table_collapse.html
new file mode 100644
index 0000000000..886e14ce97
--- /dev/null
+++ b/InvenTree/order/templates/order/po_table_collapse.html
@@ -0,0 +1,11 @@
+{% extends "collapse.html" %}
+
+{% load static %}
+
+{% block collapse_title %}
+{{ title }}
+{% endblock %}
+
+{% block collapse_content %}
+{% include "order/po_table.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
new file mode 100644
index 0000000000..b6751e044d
--- /dev/null
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -0,0 +1,154 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block page_title %}
+InvenTree | {{ order }}
+{% endblock %}
+
+{% block content %}
+
+
+
+
+ 
+
+
+
+
+
+ Purchase Order Details
+
+
+ Supplier
+ {{ order.supplier }}
+
+
+ Status
+ {% include "order/order_status.html" %}
+
+
+ Created
+ {{ order.creation_date }}
+
+
+ Created By
+ {{ order.created_by }}
+
+ {% if order.issue_date %}
+
+ Issued
+ {{ order.issue_date }}
+
+ {% endif %}
+
+
+
+
+
+
+
+
+ {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %}
+
+ {% endif %}
+
+
+Order Items
+
+{% if order.status == OrderStatus.PENDING %}
+
+{% endif %}
+
+
+
+ Line
+ Part
+ Order Code
+ Reference
+ Quantity
+ Received
+
+ {% for line in order.lines.all %}
+
+ {{ forloop.counter }}
+ {% if line.part %}
+ {{ line.part.part.full_name }}
+ {{ line.part.SKU }}
+ {% else %}
+ Warning: Part has been deleted.
+ {% endif %}
+ {{ line.reference }}
+ {{ line.quantity }}
+ {{ line.received }}
+
+ {% endfor %}
+
+
+{% if order.notes %}
+
+
+ Notes
+ {{ order.notes }}
+
+{% endif %}
+
+{% endblock %}
+
+{% block js_ready %}
+
+$("#place-order").click(function() {
+ launchModalForm("{% url 'purchase-order-issue' order.id %}",
+ {
+ reload: true,
+ });
+});
+
+$("#edit-order").click(function() {
+ launchModalForm("{% url 'purchase-order-edit' order.id %}",
+ {
+ reload: true,
+ }
+ );
+});
+
+{% if order.status == OrderStatus.PENDING %}
+$('#new-po-line').click(function() {
+ launchModalForm("{% url 'po-line-item-create' %}",
+ {
+ reload: true,
+ data: {
+ order: {{ order.id }},
+ },
+ secondary: [
+ {
+ field: 'part',
+ label: 'New Supplier Part',
+ title: 'Create new supplier part',
+ url: "{% url 'supplier-part-create' %}",
+ data: {
+ supplier: {{ order.supplier.id }},
+ },
+ },
+ ],
+ }
+ );
+});
+{% endif %}
+
+$("#po-lines-table").bootstrapTable({
+});
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html
new file mode 100644
index 0000000000..0c7ac717cd
--- /dev/null
+++ b/InvenTree/order/templates/order/purchase_orders.html
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block page_title %}
+InvenTree | Purchase Orders
+{% endblock %}
+
+{% block content %}
+
+
+
+ Purchase Orders
+
+
+
+
+
+
+
+
+{% include "order/po_table.html" %}
+
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+$("#po-create").click(function() {
+ launchModalForm("{% url 'purchase-order-create' %}",
+ {
+ reload: true,
+ }
+ );
+});
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/tests.py b/InvenTree/order/tests.py
new file mode 100644
index 0000000000..ce215e567d
--- /dev/null
+++ b/InvenTree/order/tests.py
@@ -0,0 +1 @@
+# TODO - Implement tests for the order app
diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py
new file mode 100644
index 0000000000..20379edb76
--- /dev/null
+++ b/InvenTree/order/urls.py
@@ -0,0 +1,40 @@
+"""
+URL lookup for the Order app. Provides URL endpoints for:
+
+- List view of Purchase Orders
+- Detail view of Purchase Orders
+"""
+
+from django.conf.urls import url, include
+
+from . import views
+
+purchase_order_detail_urls = [
+
+ url(r'^edit/?', views.PurchaseOrderEdit.as_view(), name='purchase-order-edit'),
+ url(r'^issue/?', views.PurchaseOrderIssue.as_view(), name='purchase-order-issue'),
+
+ url(r'^.*$', views.PurchaseOrderDetail.as_view(), name='purchase-order-detail'),
+]
+
+po_line_urls = [
+
+ url(r'^new/', views.POLineItemCreate.as_view(), name='po-line-item-create'),
+]
+
+purchase_order_urls = [
+
+ url(r'^new/', views.PurchaseOrderCreate.as_view(), name='purchase-order-create'),
+
+ # Display detail view for a single purchase order
+ url(r'^(?P\d+)/', include(purchase_order_detail_urls)),
+
+ url(r'^line/', include(po_line_urls)),
+
+ # Display complete list of purchase orders
+ url(r'^.*$', views.PurchaseOrderIndex.as_view(), name='purchase-order-index'),
+]
+
+order_urls = [
+ url(r'^purchase-order/', include(purchase_order_urls)),
+]
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
new file mode 100644
index 0000000000..718b26c98c
--- /dev/null
+++ b/InvenTree/order/views.py
@@ -0,0 +1,236 @@
+"""
+Django views for interacting with Order app
+"""
+
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.utils.translation import ugettext as _
+from django.views.generic import DetailView, ListView
+from django.forms import HiddenInput
+
+from .models import PurchaseOrder, PurchaseOrderLineItem
+from company.models import Company, SupplierPart
+
+from . import forms as order_forms
+
+from InvenTree.views import AjaxCreateView, AjaxUpdateView
+from InvenTree.helpers import str2bool
+
+from InvenTree.status_codes import OrderStatus
+
+
+class PurchaseOrderIndex(ListView):
+ """ List view for all purchase orders """
+
+ model = PurchaseOrder
+ template_name = 'order/purchase_orders.html'
+ context_object_name = 'orders'
+
+ def get_queryset(self):
+ """ Retrieve the list of purchase orders,
+ ensure that the most recent ones are returned first. """
+
+ queryset = PurchaseOrder.objects.all().order_by('-creation_date')
+
+ return queryset
+
+ def get_context_data(self, **kwargs):
+ ctx = super().get_context_data(**kwargs)
+
+ ctx['OrderStatus'] = OrderStatus
+
+ return ctx
+
+
+class PurchaseOrderDetail(DetailView):
+ """ Detail view for a PurchaseOrder object """
+
+ context_object_name = 'order'
+ queryset = PurchaseOrder.objects.all().prefetch_related('lines')
+ template_name = 'order/purchase_order_detail.html'
+
+ def get_context_data(self, **kwargs):
+ ctx = super().get_context_data(**kwargs)
+
+ ctx['OrderStatus'] = OrderStatus
+
+ return ctx
+
+
+class PurchaseOrderCreate(AjaxCreateView):
+ """ View for creating a new PurchaseOrder object using a modal form """
+
+ model = PurchaseOrder
+ ajax_form_title = "Create Purchase Order"
+ form_class = order_forms.EditPurchaseOrderForm
+
+ def get_initial(self):
+ initials = super().get_initial().copy()
+
+ initials['status'] = OrderStatus.PENDING
+
+ supplier_id = self.request.GET.get('supplier', None)
+
+ if supplier_id:
+ try:
+ supplier = Company.objects.get(id=supplier_id)
+ initials['supplier'] = supplier
+ except Company.DoesNotExist:
+ pass
+
+ return initials
+
+
+class PurchaseOrderEdit(AjaxUpdateView):
+ """ View for editing a PurchaseOrder using a modal form """
+
+ model = PurchaseOrder
+ ajax_form_title = 'Edit Purchase Order'
+ form_class = order_forms.EditPurchaseOrderForm
+
+ def get_form(self):
+
+ form = super(AjaxUpdateView, self).get_form()
+
+ order = self.get_object()
+
+ # Prevent user from editing supplier if there are already lines in the order
+ if order.lines.count() > 0 or not order.status == OrderStatus.PENDING:
+ form.fields['supplier'].widget = HiddenInput()
+
+ return form
+
+
+class PurchaseOrderIssue(AjaxUpdateView):
+ """ View for changing a purchase order from 'PENDING' to 'ISSUED' """
+
+ model = PurchaseOrder
+ ajax_form_title = 'Issue Order'
+ ajax_template_name = "order/order_issue.html"
+ form_class = order_forms.IssuePurchaseOrderForm
+
+ def post(self, request, *args, **kwargs):
+ """ Mark the purchase order as 'PLACED' """
+
+ order = self.get_object()
+ form = self.get_form()
+
+ confirm = str2bool(request.POST.get('confirm', False))
+
+ valid = False
+
+ if not confirm:
+ form.errors['confirm'] = [_('Confirm order placement')]
+ else:
+ valid = True
+
+ data = {
+ 'form_valid': valid,
+ }
+
+ if valid:
+ order.place_order()
+
+ return self.renderJsonResponse(request, form, data)
+
+
+class POLineItemCreate(AjaxCreateView):
+ """ AJAX view for creating a new PurchaseOrderLineItem object
+ """
+
+ model = PurchaseOrderLineItem
+ context_object_name = 'line'
+ form_class = order_forms.EditPurchaseOrderLineItemForm
+ ajax_form_title = 'Add Line Item'
+
+ def post(self, request, *arg, **kwargs):
+
+ self.request = request
+
+ form = self.get_form()
+
+ valid = form.is_valid()
+
+ part_id = form['part'].value()
+
+ try:
+ SupplierPart.objects.get(id=part_id)
+ except (SupplierPart.DoesNotExist, ValueError):
+ valid = False
+ form.errors['part'] = [_('This field is required')]
+
+ data = {
+ 'form_valid': valid,
+ }
+
+ if valid:
+ self.object = form.save()
+
+ data['pk'] = self.object.pk
+ data['text'] = str(self.object)
+ else:
+ self.object = None
+
+ return self.renderJsonResponse(request, form, data,)
+
+ def get_form(self):
+ """ Limit choice options based on the selected order, etc
+ """
+
+ form = super().get_form()
+
+ order_id = form['order'].value()
+
+ try:
+ order = PurchaseOrder.objects.get(id=order_id)
+
+ query = form.fields['part'].queryset
+
+ # Only allow parts from the selected supplier
+ query = query.filter(supplier=order.supplier.id)
+
+ exclude = []
+
+ for line in order.lines.all():
+ if line.part and line.part.id not in exclude:
+ exclude.append(line.part.id)
+
+ # Remove parts that are already in the order
+ query = query.exclude(id__in=exclude)
+
+ form.fields['part'].queryset = query
+ form.fields['order'].widget = HiddenInput()
+ except PurchaseOrder.DoesNotExist:
+ pass
+
+ return form
+
+ def get_initial(self):
+ """ Extract initial data for the line item.
+
+ - The 'order' will be passed as a query parameter
+ - Use this to set the 'order' field and limit the options for 'part'
+ """
+
+ initials = super().get_initial().copy()
+
+ order_id = self.request.GET.get('order', None)
+
+ if order_id:
+ try:
+ order = PurchaseOrder.objects.get(id=order_id)
+ initials['order'] = order
+
+ except PurchaseOrder.DoesNotExist:
+ pass
+
+ return initials
+
+
+class POLineItemEdit(AjaxUpdateView):
+
+ model = PurchaseOrderLineItem
+ form_class = order_forms.EditPurchaseOrderLineItemForm
+ ajax_template_name = 'modal_form.html'
+ ajax_form_action = 'Edit Line Item'
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index f311aea1f1..67a82a9504 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -33,6 +33,8 @@ from InvenTree import helpers
from InvenTree import validators
from InvenTree.models import InvenTreeTree
+from InvenTree.status_codes import BuildStatus, StockStatus, OrderStatus
+
from company.models import SupplierPart
@@ -425,7 +427,7 @@ class Part(models.Model):
then we need to restock.
"""
- return (self.total_stock - self.allocation_count) < self.minimum_stock
+ return (self.total_stock + self.on_order - self.allocation_count) < self.minimum_stock
@property
def can_build(self):
@@ -454,14 +456,14 @@ class Part(models.Model):
Builds marked as 'complete' or 'cancelled' are ignored
"""
- return [b for b in self.builds.all() if b.is_active]
+ return self.builds.filter(status__in=BuildStatus.ACTIVE_CODES)
@property
def inactive_builds(self):
""" Return a list of inactive builds
"""
- return [b for b in self.builds.all() if not b.is_active]
+ return self.builds.exclude(status__in=BuildStatus.ACTIVE_CODES)
@property
def quantity_being_built(self):
@@ -531,7 +533,7 @@ class Part(models.Model):
if self.is_template:
total = sum([variant.total_stock for variant in self.variants.all()])
else:
- total = self.stock_entries.aggregate(total=Sum('quantity'))['total']
+ total = self.stock_entries.filter(status__in=StockStatus.AVAILABLE_CODES).aggregate(total=Sum('quantity'))['total']
if total:
return total
@@ -792,6 +794,34 @@ class Part(models.Model):
return n
+ def purchase_orders(self):
+ """ Return a list of purchase orders which reference this part """
+
+ orders = []
+
+ for part in self.supplier_parts.all().prefetch_related('purchase_order_line_items'):
+ for order in part.purchase_orders():
+ if order not in orders:
+ orders.append(order)
+
+ return orders
+
+ def open_purchase_orders(self):
+ """ Return a list of open purchase orders against this part """
+
+ return [order for order in self.purchase_orders() if order.status in OrderStatus.OPEN]
+
+ def closed_purchase_orders(self):
+ """ Return a list of closed purchase orders against this part """
+
+ return [order for order in self.purchase_orders() if order.status not in OrderStatus.OPEN]
+
+ @property
+ def on_order(self):
+ """ Return the total number of items on order for this part. """
+
+ return sum([part.on_order() for part in self.supplier_parts.all().prefetch_related('purchase_order_line_items')])
+
def attach_file(instance, filename):
""" Function for storing a file for a PartAttachment
diff --git a/InvenTree/part/templates/part/orders.html b/InvenTree/part/templates/part/orders.html
new file mode 100644
index 0000000000..8c9f0c3cee
--- /dev/null
+++ b/InvenTree/part/templates/part/orders.html
@@ -0,0 +1,23 @@
+{% extends "part/part_base.html" %}
+{% load static %}
+
+{% block details %}
+
+{% include 'part/tabs.html' with tab='orders' %}
+
+
+
+ Open Part Orders
+
+
+
+
+
+{% include "order/po_table.html" with orders=part.open_purchase_orders %}
+
+{% if part.closed_purchase_orders|length > 0 %}
+Closed Orders
+{% include "order/po_table.html" with orders=part.closed_purchase_orders %}
+{% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 9c68cfe69f..2661497c74 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -96,6 +96,12 @@
{{ part.allocation_count }}
{% endif %}
+ {% if part.on_order > 0 %}
+
+ On Order
+ {{ part.on_order }}
+
+ {% endif %}
| Company | +Order Reference | +Description | +Status | +
|---|---|---|---|
| {% include "hover_image.html" with image=order.supplier.image hover=True %}{{ order.supplier.name }} | +{{ order }} | +{{ order.description }} | +{% include "order/order_status.html" %} | +
{{ title }}
+{% endblock %} + +{% block collapse_content %} +{% include "order/po_table.html" %} +{% endblock %} \ No newline at end of file diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html new file mode 100644 index 0000000000..b6751e044d --- /dev/null +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -0,0 +1,154 @@ +{% extends "base.html" %} + +{% load static %} + +{% block page_title %} +InvenTree | {{ order }} +{% endblock %} + +{% block content %} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Purchase Order Details
+| Supplier | +{{ order.supplier }} | +
| Status | +{% include "order/order_status.html" %} | +
| Created | +{{ order.creation_date }} | +
| Created By | +{{ order.created_by }} | +
| Issued | +{{ order.issue_date }} | +
+ +
+
+ {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %}
+
+ {% endif %}
+
+
+Order Items
+ +{% if order.status == OrderStatus.PENDING %} + +{% endif %} + +| Line | +Part | +Order Code | +Reference | +Quantity | +Received | +||
|---|---|---|---|---|---|---|---|
| {{ forloop.counter }} | + {% if line.part %} +{{ line.part.part.full_name }} | +{{ line.part.SKU }} | + {% else %} +Warning: Part has been deleted. | + {% endif %} +{{ line.reference }} | +{{ line.quantity }} | +{{ line.received }} | +|
+
+
+{% endif %}
+
+{% endblock %}
+
+{% block js_ready %}
+
+$("#place-order").click(function() {
+ launchModalForm("{% url 'purchase-order-issue' order.id %}",
+ {
+ reload: true,
+ });
+});
+
+$("#edit-order").click(function() {
+ launchModalForm("{% url 'purchase-order-edit' order.id %}",
+ {
+ reload: true,
+ }
+ );
+});
+
+{% if order.status == OrderStatus.PENDING %}
+$('#new-po-line').click(function() {
+ launchModalForm("{% url 'po-line-item-create' %}",
+ {
+ reload: true,
+ data: {
+ order: {{ order.id }},
+ },
+ secondary: [
+ {
+ field: 'part',
+ label: 'New Supplier Part',
+ title: 'Create new supplier part',
+ url: "{% url 'supplier-part-create' %}",
+ data: {
+ supplier: {{ order.supplier.id }},
+ },
+ },
+ ],
+ }
+ );
+});
+{% endif %}
+
+$("#po-lines-table").bootstrapTable({
+});
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html
new file mode 100644
index 0000000000..0c7ac717cd
--- /dev/null
+++ b/InvenTree/order/templates/order/purchase_orders.html
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block page_title %}
+InvenTree | Purchase Orders
+{% endblock %}
+
+{% block content %}
+
+Notes
+ {{ order.notes }}
+
+
+
+{% include "order/po_table.html" %}
+
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+$("#po-create").click(function() {
+ launchModalForm("{% url 'purchase-order-create' %}",
+ {
+ reload: true,
+ }
+ );
+});
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/tests.py b/InvenTree/order/tests.py
new file mode 100644
index 0000000000..ce215e567d
--- /dev/null
+++ b/InvenTree/order/tests.py
@@ -0,0 +1 @@
+# TODO - Implement tests for the order app
diff --git a/InvenTree/order/urls.py b/InvenTree/order/urls.py
new file mode 100644
index 0000000000..20379edb76
--- /dev/null
+++ b/InvenTree/order/urls.py
@@ -0,0 +1,40 @@
+"""
+URL lookup for the Order app. Provides URL endpoints for:
+
+- List view of Purchase Orders
+- Detail view of Purchase Orders
+"""
+
+from django.conf.urls import url, include
+
+from . import views
+
+purchase_order_detail_urls = [
+
+ url(r'^edit/?', views.PurchaseOrderEdit.as_view(), name='purchase-order-edit'),
+ url(r'^issue/?', views.PurchaseOrderIssue.as_view(), name='purchase-order-issue'),
+
+ url(r'^.*$', views.PurchaseOrderDetail.as_view(), name='purchase-order-detail'),
+]
+
+po_line_urls = [
+
+ url(r'^new/', views.POLineItemCreate.as_view(), name='po-line-item-create'),
+]
+
+purchase_order_urls = [
+
+ url(r'^new/', views.PurchaseOrderCreate.as_view(), name='purchase-order-create'),
+
+ # Display detail view for a single purchase order
+ url(r'^(?P
+
+ Purchase Orders
+
+
+
+
+
+
+
+
+{% include "order/po_table.html" with orders=part.open_purchase_orders %}
+
+{% if part.closed_purchase_orders|length > 0 %}
+
+
+ Open Part Orders
+
+
+