Merged master and resolved conflicts

InvenTree/order/forms.py

@@ -211,6 +211,7 @@ class EditSalesOrderLineItemForm(HelperForm):
             '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 @@ class SOLineItemSerializer(InvenTreeModelSerializer):
     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 SOLineItemSerializer(InvenTreeModelSerializer):
             '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 @@ $("#so-lines-table").inventreeTable({
             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 @@ $("#so-lines-table").inventreeTable({
                         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 @@ $("#so-lines-table").inventreeTable({
                     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 @@ function setupCallbacks() {
             },
         });
     });
+
+    $(".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

@@ -32,6 +32,7 @@ purchase_order_urls = [
     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)),

InvenTree/order/views.py

@@ -7,6 +7,7 @@ from __future__ import unicode_literals
 
 from django.db import transaction
 from django.db.utils import IntegrityError
+from django.http.response import JsonResponse
 from django.shortcuts import get_object_or_404
 from django.core.exceptions import ValidationError
 from django.urls import reverse
@@ -14,7 +15,7 @@ from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import DetailView, ListView, UpdateView
 from django.views.generic.edit import FormMixin
-from django.forms import HiddenInput
+from django.forms import HiddenInput, IntegerField
 
 import logging
 from decimal import Decimal, InvalidOperation
@@ -24,7 +25,7 @@ from .models import SalesOrder, SalesOrderLineItem, SalesOrderAttachment
 from .models import SalesOrderAllocation
 from .admin import POLineItemResource
 from build.models import Build
-from company.models import Company, SupplierPart  # ManufacturerPart
+from company.models import Company, SupplierPart
 from stock.models import StockItem, StockLocation
 from part.models import Part
 
@@ -32,6 +33,7 @@ from common.models import InvenTreeSetting
 from common.views import FileManagementFormView
 
 from . import forms as order_forms
+from part.views import PartPricing
 
 from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView
 from InvenTree.helpers import DownloadFile, str2bool
@@ -567,165 +569,6 @@ class SalesOrderShip(AjaxUpdateView):
         return self.renderJsonResponse(request, form, data, context)
 
 
-class PurchaseOrderUpload(FileManagementFormView):
-    ''' PurchaseOrder: Upload file, match to fields and parts (using multi-Step form) '''
-
-    name = 'order'
-    form_steps_template = [
-        'order/order_wizard/po_upload.html',
-        'order/order_wizard/match_fields.html',
-        'order/order_wizard/match_parts.html',
-    ]
-    form_steps_description = [
-        _("Upload File"),
-        _("Match Fields"),
-        _("Match Supplier Parts"),
-    ]
-
-    def get_order(self):
-        """ Get order or return 404 """
-
-        return get_object_or_404(PurchaseOrder, pk=self.kwargs['pk'])
-
-    def get_context_data(self, form, **kwargs):
-        context = super().get_context_data(form=form, **kwargs)
-
-        order = self.get_order()
-
-        context.update({'order': order})
-
-        return context
-
-    def get_field_selection(self):
-        """ Once data columns have been selected, attempt to pre-select the proper data from the database.
-        This function is called once the field selection has been validated.
-        The pre-fill data are then passed through to the SupplierPart selection form.
-        """
-
-        order = self.get_order()
-
-        self.allowed_items = SupplierPart.objects.filter(supplier=order.supplier).prefetch_related('manufacturer_part')
-
-        # Fields prefixed with "Part_" can be used to do "smart matching" against Part objects in the database
-        q_idx = self.get_column_index('Quantity')
-        s_idx = self.get_column_index('Supplier_SKU')
-        m_idx = self.get_column_index('Manufacturer_MPN')
-        # p_idx = self.get_column_index('Unit_Price')
-        # e_idx = self.get_column_index('Extended_Price')
-
-        for row in self.rows:
-
-            # Initially use a quantity of zero
-            quantity = Decimal(0)
-
-            # Initially we do not have a part to reference
-            exact_match_part = None
-
-            # Check if there is a column corresponding to "quantity"
-            if q_idx >= 0:
-                q_val = row['data'][q_idx]['cell']
-
-                if q_val:
-                    # Delete commas
-                    q_val = q_val.replace(',', '')
-
-                    try:
-                        # Attempt to extract a valid quantity from the field
-                        quantity = Decimal(q_val)
-                    except (ValueError, InvalidOperation):
-                        pass
-
-            # Store the 'quantity' value
-            row['quantity'] = quantity
-
-            # Check if there is a column corresponding to "Supplier SKU"
-            if s_idx >= 0:
-                sku = row['data'][s_idx]['cell']
-
-                try:
-                    # Attempt SupplierPart lookup based on SKU value
-                    exact_match_part = self.allowed_items.get(SKU__contains=sku)
-                except (ValueError, SupplierPart.DoesNotExist, SupplierPart.MultipleObjectsReturned):
-                    exact_match_part = None
-
-            # Check if there is a column corresponding to "Manufacturer MPN"
-            if m_idx >= 0:
-                mpn = row['data'][m_idx]['cell']
-
-                try:
-                    # Attempt SupplierPart lookup based on MPN value
-                    exact_match_part = self.allowed_items.get(manufacturer_part__MPN__contains=mpn)
-                except (ValueError, SupplierPart.DoesNotExist, SupplierPart.MultipleObjectsReturned):
-                    exact_match_part = None
-
-            # Supply list of part options for each row, sorted by how closely they match the part name
-            row['item_options'] = self.allowed_items
-
-            # Unless found, the 'part_match' is blank
-            row['item_match'] = None
-
-            if exact_match_part:
-                # If there is an exact match based on SKU or MPN, use that
-                row['item_match'] = exact_match_part
-
-    def done(self, form_list, **kwargs):
-        """ Once all the data is in, process it to add SupplierPart items to the order """
-        
-        order = self.get_order()
-
-        items = {}
-
-        for form_key, form_value in self.get_all_cleaned_data().items():
-            # Split key from row value
-            try:
-                (field, idx) = form_key.split('-')
-            except ValueError:
-                continue
-            
-            if field == self.key_item_select:
-                if idx not in items:
-                    # Insert into items
-                    items.update({
-                        idx: {
-                            'field': form_value,
-                        }
-                    })
-                else:
-                    # Update items
-                    items[idx]['field'] = form_value
-
-            if field == self.key_quantity_select:
-                if idx not in items:
-                    # Insert into items
-                    items.update({
-                        idx: {
-                            'quantity': form_value,
-                        }
-                    })
-                else:
-                    # Update items
-                    items[idx]['quantity'] = form_value
-
-        # Create PurchaseOrderLineItem instances
-        for purchase_order_item in items.values():
-            try:
-                supplier_part = SupplierPart.objects.get(pk=int(purchase_order_item['field']))
-            except (ValueError, SupplierPart.DoesNotExist):
-                continue
-            purchase_order_line_item = PurchaseOrderLineItem(
-                order=order,
-                part=supplier_part,
-                quantity=purchase_order_item['quantity'],
-            )
-            try:
-                purchase_order_line_item.save()
-            except IntegrityError:
-                # PurchaseOrderLineItem already exists
-                pass
-            
-        return HttpResponseRedirect(reverse('po-detail', kwargs={'pk': self.kwargs['pk']}))
-
-
 class PurchaseOrderExport(AjaxView):
     """ File download for a purchase order
 
@@ -1407,6 +1250,18 @@ class SOLineItemCreate(AjaxCreateView):
 
         return initials
 
+    def save(self, form):
+        ret = form.save()
+        # check if price s set in form - else autoset
+        if not ret.sale_price:
+            price = ret.part.get_price(ret.quantity)
+            # only if price is avail
+            if price:
+                ret.sale_price = price / ret.quantity
+                ret.save()
+        self.object = ret
+        return ret
+
 
 class SOLineItemEdit(AjaxUpdateView):
     """ View for editing a SalesOrderLineItem """
@@ -1733,3 +1588,101 @@ class SalesOrderAllocationDelete(AjaxDeleteView):
     ajax_form_title = _("Remove allocation")
     context_object_name = 'allocation'
     ajax_template_name = "order/so_allocation_delete.html"
+
+
+class LineItemPricing(PartPricing):
+    """ View for inspecting part pricing information """
+
+    class EnhancedForm(PartPricing.form_class):
+        pk = IntegerField(widget=HiddenInput())
+        so_line = IntegerField(widget=HiddenInput())
+
+    form_class = EnhancedForm
+
+    def get_part(self, id=False):
+        if 'line_item' in self.request.GET:
+            try:
+                part_id = self.request.GET.get('line_item')
+                part = SalesOrderLineItem.objects.get(id=part_id).part
+            except Part.DoesNotExist:
+                return None
+        elif 'pk' in self.request.POST:
+            try:
+                part_id = self.request.POST.get('pk')
+                part = Part.objects.get(id=part_id)
+            except Part.DoesNotExist:
+                return None
+        else:
+            return None
+
+        if id:
+            return part.id
+        return part
+
+    def get_so(self, pk=False):
+        so_line = self.request.GET.get('line_item', None)
+        if not so_line:
+            so_line = self.request.POST.get('so_line', None)
+
+        if so_line:
+            try:
+                sales_order = SalesOrderLineItem.objects.get(pk=so_line)
+                if pk:
+                    return sales_order.pk
+                return sales_order
+            except Part.DoesNotExist:
+                return None
+        return None
+
+    def get_quantity(self):
+        """ Return set quantity in decimal format """
+        qty = Decimal(self.request.GET.get('quantity', 1))
+        if qty == 1:
+            return Decimal(self.request.POST.get('quantity', 1))
+        return qty
+
+    def get_initials(self):
+        initials = super().get_initials()
+        initials['pk'] = self.get_part(id=True)
+        initials['so_line'] = self.get_so(pk=True)
+        return initials
+
+    def post(self, request, *args, **kwargs):
+        # parse extra actions
+        REF = 'act-btn_'
+        act_btn = [a.replace(REF, '') for a in self.request.POST if REF in a]
+
+        # check if extra action was passed
+        if act_btn and act_btn[0] == 'update_price':
+            # get sales order
+            so_line = self.get_so()
+            if not so_line:
+                self.data = {'non_field_errors': [_('Sales order not found')]}
+            else:
+                quantity = self.get_quantity()
+                price = self.get_pricing(quantity).get('unit_part_price', None)
+
+                if not price:
+                    self.data = {'non_field_errors': [_('Price not found')]}
+                else:
+                    # set normal update note
+                    note = _('Updated {part} unit-price to {price}')
+
+                    # check qunatity and update if different
+                    if so_line.quantity != quantity:
+                        so_line.quantity = quantity
+                        note = _('Updated {part} unit-price to {price} and quantity to {qty}')
+
+                    # update sale_price
+                    so_line.sale_price = price
+                    so_line.save()
+
+                    # parse response
+                    data = {
+                        'form_valid': True,
+                        'success': note.format(part=str(so_line.part), price=str(so_line.sale_price), qty=quantity)
+                    }
+                    return JsonResponse(data=data)
+
+        # let the normal pricing view run
+        return super().post(request, *args, **kwargs)