Convert some more fields to decimal

- purchase order line item quantity
- purchase order line item received

InvenTree/order/migrations/0013_auto_20191118_2323.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.5 on 2019-11-18 23:23
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0012_auto_20190617_1943'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='quantity',
+            field=models.DecimalField(decimal_places=5, default=1, help_text='Item quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]

InvenTree/order/migrations/0014_auto_20191118_2328.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.5 on 2019-11-18 23:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0013_auto_20191118_2323'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='received',
+            field=models.DecimalField(decimal_places=5, default=0, help_text='Number of items received', max_digits=15),
+        ),
+    ]

InvenTree/order/models.py

@@ -242,7 +242,7 @@ class OrderLineItem(models.Model):
     class Meta:
         abstract = True
 
-    quantity = models.PositiveIntegerField(validators=[MinValueValidator(0)], default=1, help_text=_('Item quantity'))
+    quantity = models.DecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1, help_text=_('Item quantity'))
 
     reference = models.CharField(max_length=100, blank=True, help_text=_('Line item reference'))
     
@@ -284,7 +284,7 @@ class PurchaseOrderLineItem(OrderLineItem):
         help_text=_("Supplier part"),
     )
 
-    received = models.PositiveIntegerField(default=0, help_text=_('Number of items received'))
+    received = models.DecimalField(decimal_places=5, max_digits=15, default=0, help_text=_('Number of items received'))
 
     def remaining(self):
         """ Calculate the number of items remaining to be received """

InvenTree/order/templates/order/purchase_order_detail.html

@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 
+{% load i18n %}
 {% load static %}
+{% load inventree_extras %}
 
 {% block page_title %}
 InvenTree | {{ order }}
@@ -55,29 +57,29 @@ InvenTree | {{ order }}
         </div>
     </div>
     <div class='col-sm-6'>
-        <h4>Purchase Order Details</h4>
+        <h4>{% trans "Purchase Order Details" %}</h4>
         <table class='table'>
             <tr>
-                <td>Supplier</td>
+                <td>{% trans "Supplier" %}</td>
                 <td><a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier }}</a></td>
             </tr>
             <tr>
-                <td>Status</td>
+                <td>{% trans "Status" %}</td>
                 <td>{% include "order/order_status.html" %}</td>
             </tr>
             <tr>
-                <td>Created</td>
+                <td>{% trans "Created" %}</td>
                 <td>{{ order.creation_date }}<span class='badge'>{{ order.created_by }}</span></td>
             </tr>
             {% if order.issue_date %}
             <tr>
-                <td>Issued</td>
+                <td>{% trans "Issued" %}</td>
                 <td>{{ order.issue_date }}</td>
             </tr>
             {% endif %}
             {% if order.status == OrderStatus.COMPLETE %}
             <tr>
-                <td>Received</td>
+                <td>{% trans "Received" %}</td>
                 <td>{{ order.complete_date }}<span class='badge'>{{ order.received_by }}</span></td>
             </tr>
             {% endif %}
@@ -98,16 +100,16 @@ InvenTree | {{ order }}
 <table class='table table-striped table-condensed' id='po-lines-table' data-toolbar='#order-toolbar-buttons'>
     <thead>
     <tr>
-        <th data-sortable='true'>Line</th>
-        <th data-sortable='true'>Part</th>
-        <th>Description</th>
-        <th data-sortable='true'>Order Code</th>
-        <th data-sortable='true'>Reference</th>
-        <th data-sortable='true'>Quantity</th>
+        <th data-sortable='true'>{% trans "Line" %}</th>
+        <th data-sortable='true'>{% trans "Part" %}</th>
+        <th>{% trans "Description" %}</th>
+        <th data-sortable='true'>{% trans "Order Code" %}</th>
+        <th data-sortable='true'>{% trans "Reference" %}</th>
+        <th data-sortable='true'>{% trans "Quantity" %}</th>
         {% if not order.status == OrderStatus.PENDING %}
-        <th data-sortable='true'>Received</th>
+        <th data-sortable='true'>{% trans "Received" %}</th>
         {% endif %}
-        <th>Note</th>
+        <th>{% trans "Note" %}</th>
         <th></th>
     </tr>
     </thead>
@@ -128,9 +130,9 @@ InvenTree | {{ order }}
         <td colspan='3'><strong>Warning: Part has been deleted.</strong></td>
         {% endif %}
         <td>{{ line.reference }}</td>
-        <td>{{ line.quantity }}</td>
+        <td>{% decimal line.quantity %}</td>
         {% if not order.status == OrderStatus.PENDING %}
-        <td>{{ line.received }}</td>
+        <td>{% decimal line.received %}</td>
         {% endif %}
         <td>
             {{ line.notes }}
@@ -160,7 +162,7 @@ InvenTree | {{ order }}
 {% if order.notes %}
 <hr>
 <div class='panel panel-default'>
-    <div class='panel-heading'><b>Notes</b></div>
+    <div class='panel-heading'><b>{% trans "Notes" %}</b></div>
     <div class='panel-body'>{{ order.notes }}</div>
 </div>
 {% endif %}