ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Marwan Alwali 2024-12-31 18:57:45 +03:00
parent 9b575dbc72
commit c396960eaf
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
inventory/__pycache__/forms.cpython-311.pyc
View File

Binary file not shown.

BIN
inventory/__pycache__/urls.cpython-311.pyc
View File

Binary file not shown.

BIN
inventory/__pycache__/utils.cpython-311.pyc
View File

Binary file not shown.

BIN
inventory/__pycache__/views.cpython-311.pyc
View File

Binary file not shown.

18
inventory/forms.py
View File

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

1
inventory/views.py
View File

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