From b2a732197bbad3f4a3cde1ee792fafc674ea303f Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 2 Jan 2021 21:54:07 +1100
Subject: [PATCH] Fix target date form field for SalesOrder

---
 InvenTree/InvenTree/fields.py | 2 +-
 InvenTree/build/forms.py      | 4 ++--
 InvenTree/order/forms.py      | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/InvenTree/InvenTree/fields.py b/InvenTree/InvenTree/fields.py
index b11b443645..c0e1633ac7 100644
--- a/InvenTree/InvenTree/fields.py
+++ b/InvenTree/InvenTree/fields.py
@@ -34,7 +34,7 @@ class InvenTreeURLField(models.URLField):
         })
 
 
-class InvenTreeDatePickerFormField(forms.DateField):
+class DatePickerFormField(forms.DateField):
     """
     Custom date-picker field
     """
diff --git a/InvenTree/build/forms.py b/InvenTree/build/forms.py
index cd3d4bbcfb..136d21d553 100644
--- a/InvenTree/build/forms.py
+++ b/InvenTree/build/forms.py
@@ -10,7 +10,7 @@ from django import forms
 
 from InvenTree.forms import HelperForm
 from InvenTree.fields import RoundingDecimalFormField
-from InvenTree.fields import InvenTreeDatePickerFormField
+from InvenTree.fields import DatePickerFormField
 
 from .models import Build, BuildItem, BuildOrderAttachment
 
@@ -35,7 +35,7 @@ class EditBuildForm(HelperForm):
         'target_date': _('Order target date'),
     }
 
-    target_date = InvenTreeDatePickerFormField(
+    target_date = DatePickerFormField(
         help_text=_('Target date for build completion. Build will be overdue after this date.')
     )
 
diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py
index d797a4e42d..6db51b55e6 100644
--- a/InvenTree/order/forms.py
+++ b/InvenTree/order/forms.py
@@ -12,6 +12,7 @@ from mptt.fields import TreeNodeChoiceField
 
 from InvenTree.forms import HelperForm
 from InvenTree.fields import RoundingDecimalFormField
+from InvenTree.fields import DatePickerFormField
 
 from stock.models import StockLocation
 from .models import PurchaseOrder, PurchaseOrderLineItem, PurchaseOrderAttachment
@@ -120,6 +121,7 @@ class EditSalesOrderForm(HelperForm):
         self.field_prefix = {
             'reference': 'SO',
             'link': 'fa-link',
+            'target_date': 'fa-calendar-alt',
         }
 
         self.field_placeholder = {
@@ -128,11 +130,8 @@ class EditSalesOrderForm(HelperForm):
 
         super().__init__(*args, **kwargs)
 
-    # TODO: Improve this using a better date picker
-    target_date = forms.DateField(
-        widget=forms.DateInput(
-            attrs={'type': 'date'},
-        )
+    target_date = DatePickerFormField(
+        help_text=_('Target date for order completion. Order will be overdue after this date.'),
     )
 
     class Meta: