update

inventory/forms.py

@@ -24,11 +24,7 @@ from .models import (
     SaleQuotationCar,
     AdditionalServices,
     Staff,
-<<<<<<< HEAD
-=======
-    Opportunity
-
->>>>>>> 8b00f9a40fc336f209f4ae6fb03785df6c97d265
+    Opportunity, DealStatus, Priority, DealSource,
 )
 from django_ledger.models import ItemModel, InvoiceModel
 from django.forms import ModelMultipleChoiceField, ValidationError
@@ -532,7 +528,6 @@ class ItemForm(forms.Form):
     unit_sales_price = forms.DecimalField(label="Unit Sales Price", required=True)
 
 
-<<<<<<< HEAD
 class PaymentForm(forms.Form):
     invoice = forms.ModelChoiceField(
         queryset=InvoiceModel.objects.all(), label="Invoice", required=True
@@ -559,7 +554,9 @@ class EmailForm(forms.Form):
     message = forms.CharField(widget=forms.Textarea)
     from_email = forms.EmailField()
     to_email = forms.EmailField()
-=======
+
+
+
 class OpportunityForm(forms.ModelForm):
     class Meta:
         model = Opportunity
@@ -568,8 +565,7 @@ class OpportunityForm(forms.ModelForm):
             'priority', 'source'
         ]
         widgets = {
-            'deal_status': forms.Select(choices=Opportunity.DEAL_STATUS_CHOICES),
-            'priority': forms.Select(choices=Opportunity.PRIORITY_CHOICES),
-            'source': forms.Select(choices=Opportunity.DEAL_SOURCES_CHOICES),
+            'deal_status': forms.Select(choices=DealStatus.choices),
+            'priority': forms.Select(choices=Priority.choices),
+            'source': forms.Select(choices=DealSource.choices),
         }
->>>>>>> 8b00f9a40fc336f209f4ae6fb03785df6c97d265

inventory/views.py

@@ -1,4 +1,3 @@
-
 from django.core.paginator import Paginator
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt