adds sales order line item price

InvenTree/InvenTree/static/css/inventree.css

@@ -466,6 +466,24 @@
     background: #eee;
 }
 
+/* pricing table widths */
+.table-price-two tr td:first-child {
+    width: 40%;
+}
+
+.table-price-three tr td:first-child {
+    width: 40%;
+}
+
+.table-price-two tr td:last-child {
+    width: 60%;
+}
+
+.table-price-three tr td:last-child {
+    width: 30%;
+}
+/* !pricing table widths */
+
 .btn-glyph {
     padding-left: 6px;
     padding-right: 6px;

InvenTree/InvenTree/static/script/inventree/inventree.js

@@ -100,7 +100,7 @@ function makeIconButton(icon, cls, pk, title, options={}) {
     if (options.disabled) {
         extraProps += "disabled='true' ";
     }
-    
+
     html += `<button pk='${pk}' id='${id}' class='${classes}' title='${title}' ${extraProps}>`;
     html += `<span class='fas ${icon}'></span>`;
     html += `</button>`;

InvenTree/common/models.py

@@ -7,6 +7,8 @@
 from __future__ import unicode_literals
 
 import os
+import decimal
+import math
 
 from django.db import models, transaction
 from django.db.utils import IntegrityError, OperationalError
@@ -730,6 +732,72 @@ def convert_to(self, currency_code):
         return converted.amount
 
 
+def get_price(instance, quantity, moq=True, multiples=True, currency=None):
+    """ Calculate the price based on quantity price breaks.
+
+    - Don't forget to add in flat-fee cost (base_cost field)
+    - If MOQ (minimum order quantity) is required, bump quantity
+    - If order multiples are to be observed, then we need to calculate based on that, too
+    """
+
+    price_breaks = instance.price_breaks.all()
+
+    # No price break information available?
+    if len(price_breaks) == 0:
+        return None
+
+    # Check if quantity is fraction and disable multiples
+    multiples = (quantity % 1 == 0)
+
+    # Order multiples
+    if multiples:
+        quantity = int(math.ceil(quantity / instance.multiple) * instance.multiple)
+
+    pb_found = False
+    pb_quantity = -1
+    pb_cost = 0.0
+
+    if currency is None:
+        # Default currency selection
+        currency = InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
+
+    pb_min = None
+    for pb in instance.price_breaks.all():
+        # Store smallest price break
+        if not pb_min:
+            pb_min = pb
+
+        # Ignore this pricebreak (quantity is too high)
+        if pb.quantity > quantity:
+            continue
+
+        pb_found = True
+
+        # If this price-break quantity is the largest so far, use it!
+        if pb.quantity > pb_quantity:
+            pb_quantity = pb.quantity
+
+            # Convert everything to the selected currency
+            pb_cost = pb.convert_to(currency)
+
+    # Use smallest price break
+    if not pb_found and pb_min:
+        # Update price break information
+        pb_quantity = pb_min.quantity
+        pb_cost = pb_min.convert_to(currency)
+        # Trigger cost calculation using smallest price break
+        pb_found = True
+
+    # Convert quantity to decimal.Decimal format
+    quantity = decimal.Decimal(f'{quantity}')
+
+    if pb_found:
+        cost = pb_cost * quantity
+        return InvenTree.helpers.normalize(cost + instance.base_cost)
+    else:
+        return None
+
+
 class ColorTheme(models.Model):
     """ Color Theme Setting """
 

InvenTree/company/models.py

@@ -6,8 +6,6 @@
 from __future__ import unicode_literals
 
 import os
-import decimal
-import math
 
 from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MinValueValidator
@@ -26,7 +24,6 @@
 from stdimage.models import StdImageField
 
 from InvenTree.helpers import getMediaUrl, getBlankImage, getBlankThumbnail
-from InvenTree.helpers import normalize
 from InvenTree.fields import InvenTreeURLField
 from InvenTree.status_codes import PurchaseOrderStatus
 
@@ -558,70 +555,7 @@ def add_price_break(self, quantity, price):
             price=price
         )
 
-    def get_price(self, quantity, moq=True, multiples=True, currency=None):
-        """ Calculate the supplier price based on quantity price breaks.
-
-        - Don't forget to add in flat-fee cost (base_cost field)
-        - If MOQ (minimum order quantity) is required, bump quantity
-        - If order multiples are to be observed, then we need to calculate based on that, too
-        """
-
-        price_breaks = self.price_breaks.all()
-
-        # No price break information available?
-        if len(price_breaks) == 0:
-            return None
-
-        # Check if quantity is fraction and disable multiples
-        multiples = (quantity % 1 == 0)
-
-        # Order multiples
-        if multiples:
-            quantity = int(math.ceil(quantity / self.multiple) * self.multiple)
-
-        pb_found = False
-        pb_quantity = -1
-        pb_cost = 0.0
-
-        if currency is None:
-            # Default currency selection
-            currency = common.models.InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY')
-
-        pb_min = None
-        for pb in self.price_breaks.all():
-            # Store smallest price break
-            if not pb_min:
-                pb_min = pb
-
-            # Ignore this pricebreak (quantity is too high)
-            if pb.quantity > quantity:
-                continue
-
-            pb_found = True
-
-            # If this price-break quantity is the largest so far, use it!
-            if pb.quantity > pb_quantity:
-                pb_quantity = pb.quantity
-
-                # Convert everything to the selected currency
-                pb_cost = pb.convert_to(currency)
-
-        # Use smallest price break
-        if not pb_found and pb_min:
-            # Update price break information
-            pb_quantity = pb_min.quantity
-            pb_cost = pb_min.convert_to(currency)
-            # Trigger cost calculation using smallest price break
-            pb_found = True
-
-        # Convert quantity to decimal.Decimal format
-        quantity = decimal.Decimal(f'{quantity}')
-
-        if pb_found:
-            cost = pb_cost * quantity
-            return normalize(cost + self.base_cost)
-        else:
-            return None
+    get_price = common.models.get_price
 
     def open_orders(self):
         """ Return a database query for PO line items for this SupplierPart,

InvenTree/order/forms.py

@@ -211,6 +211,7 @@ class Meta:
             'part',
             'quantity',
             'reference',
+            'sale_price',
             'notes'
         ]
 

InvenTree/order/migrations/0045_auto_20210504_1946.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2 on 2021-05-04 19:46
+
+from django.db import migrations
+import djmoney.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0044_auto_20210404_2016'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='salesorderlineitem',
+            name='sale_price',
+            field=djmoney.models.fields.MoneyField(blank=True, decimal_places=4, default_currency='USD', help_text='Unit sale price', max_digits=19, null=True, verbose_name='Sale Price'),
+        ),
+        migrations.AddField(
+            model_name='salesorderlineitem',
+            name='sale_price_currency',
+            field=djmoney.models.fields.CurrencyField(choices=[('AUD', 'Australian Dollar'), ('GBP', 'British Pound'), ('CAD', 'Canadian Dollar'), ('EUR', 'Euro'), ('JPY', 'Japanese Yen'), ('NZD', 'New Zealand Dollar'), ('USD', 'US Dollar')], default='USD', editable=False, max_length=3),
+        ),
+    ]

InvenTree/order/models.py

@@ -672,12 +672,22 @@ class SalesOrderLineItem(OrderLineItem):
     Attributes:
         order: Link to the SalesOrder that this line item belongs to
         part: Link to a Part object (may be null)
+        sale_price: The unit sale price for this OrderLineItem
     """
 
     order = models.ForeignKey(SalesOrder, on_delete=models.CASCADE, related_name='lines', verbose_name=_('Order'), help_text=_('Sales Order'))
 
     part = models.ForeignKey('part.Part', on_delete=models.SET_NULL, related_name='sales_order_line_items', null=True, verbose_name=_('Part'), help_text=_('Part'), limit_choices_to={'salable': True})
 
+    sale_price = MoneyField(
+        max_digits=19,
+        decimal_places=4,
+        default_currency='USD',
+        null=True, blank=True,
+        verbose_name=_('Sale Price'),
+        help_text=_('Unit sale price'),
+    )
+
     class Meta:
         unique_together = [
         ]

InvenTree/order/serializers.py

@@ -278,6 +278,7 @@ def __init__(self, *args, **kwargs):
     quantity = serializers.FloatField()
     allocated = serializers.FloatField(source='allocated_quantity', read_only=True)
     fulfilled = serializers.FloatField(source='fulfilled_quantity', read_only=True)
+    sale_price_string = serializers.CharField(source='sale_price', read_only=True)
 
     class Meta:
         model = SalesOrderLineItem
@@ -294,6 +295,9 @@ class Meta:
             'order_detail',
             'part',
             'part_detail',
+            'sale_price',
+            'sale_price_currency',
+            'sale_price_string',
         ]
 
 

InvenTree/order/templates/order/sales_order_detail.html

@@ -223,6 +223,14 @@
             field: 'quantity',
             title: '{% trans "Quantity" %}',
         },
+        {
+            sortable: true,
+            field: 'sale_price',
+            title: '{% trans "Unit Price" %}',
+            formatter: function(value, row) {
+                return row.sale_price_string || row.sale_price;
+            }
+        },
         {
             field: 'allocated',
             {% if order.status == SalesOrderStatus.PENDING %}
@@ -279,7 +287,7 @@
                         html += makeIconButton('fa-hashtag icon-green', 'button-add-by-sn', pk, '{% trans "Allocate serial numbers" %}');
                     }
 
-                    html += makeIconButton('fa-sign-in-alt icon-green', 'button-add', pk, '{% trans "Allocate stock" %}');   
+                    html += makeIconButton('fa-sign-in-alt icon-green', 'button-add', pk, '{% trans "Allocate stock" %}');
 
                     if (part.purchaseable) {
                         html += makeIconButton('fa-shopping-cart', 'button-buy', row.part, '{% trans "Purchase stock" %}');
@@ -288,7 +296,8 @@
                     if (part.assembly) {
                         html += makeIconButton('fa-tools', 'button-build', row.part, '{% trans "Build stock" %}');
                     }
-
+
+                    html += makeIconButton('fa-dollar-sign icon-green', 'button-price', pk, '{% trans "Calculate price" %}');
                 }
 
                 html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line item" %}');
@@ -388,6 +397,26 @@
             },
         });
     });
+
+    $(".button-price").click(function() {
+        var pk = $(this).attr('pk');
+        var idx = $(this).closest('tr').attr('data-index');
+        var row = table.bootstrapTable('getData')[idx];
+
+        launchModalForm(
+            "{% url 'line-pricing' %}",
+            {
+                submit_text: '{% trans "Calculate price" %}',
+                data: {
+                    line_item: pk,
+                    quantity: row.quantity,
+                },
+                buttons: [{name: 'update_price',
+                    title: '{% trans "Update Unit Price" %}'},],
+                success: reloadTable,
+            }
+        );
+    });
 }
 
 {% endblock %}

InvenTree/order/urls.py

@@ -31,6 +31,7 @@
     url(r'^new/', views.PurchaseOrderCreate.as_view(), name='po-create'),
 
     url(r'^order-parts/', views.OrderParts.as_view(), name='order-parts'),
+    url(r'^pricing/', views.LineItemPricing.as_view(), name='line-pricing'),
 
     # Display detail view for a single purchase order
     url(r'^(?P<pk>\d+)/', include(purchase_order_detail_urls)),