users.migrations
diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc
index 0142ac3..3e6235b 100644
Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ
diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 49cf851..dcddce6 100644
Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ
diff --git a/core/management/__init__.py b/core/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/management/commands/__init__.py b/core/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/management/commands/check_database.py b/core/management/commands/check_database.py
new file mode 100644
index 0000000..6b2e65a
--- /dev/null
+++ b/core/management/commands/check_database.py
@@ -0,0 +1,43 @@
+from django.core.management.base import BaseCommand
+from django.conf import settings
+import os
+
+class Command(BaseCommand):
+ help = 'Check database path and contents'
+
+ def handle(self, *args, **options):
+ # Show database path
+ db_path = settings.DATABASES['default']['NAME']
+ self.stdout.write(f'Database path: {db_path}')
+ self.stdout.write(f'Database exists: {os.path.exists(db_path)}')
+
+ if os.path.exists(db_path):
+ # Check file size
+ file_size = os.path.getsize(db_path)
+ self.stdout.write(f'Database size: {file_size} bytes ({file_size / 1024:.2f} KB)')
+
+ # Try to access some data
+ try:
+ from purchase.models import Supplier
+ from sales.models import Customer
+
+ supplier_count = Supplier.objects.count()
+ customer_count = Customer.objects.count()
+
+ self.stdout.write(f'Suppliers in database: {supplier_count}')
+ self.stdout.write(f'Customers in database: {customer_count}')
+
+ if supplier_count > 0:
+ self.stdout.write('First 3 suppliers:')
+ for supplier in Supplier.objects.all()[:3]:
+ self.stdout.write(f' - {supplier.name} ({supplier.code})')
+
+ if customer_count > 0:
+ self.stdout.write('First 3 customers:')
+ for customer in Customer.objects.all()[:3]:
+ self.stdout.write(f' - {customer.name} ({customer.code})')
+
+ except Exception as e:
+ self.stdout.write(f'Error accessing database contents: {e}')
+ else:
+ self.stdout.write('Database file not found')
\ No newline at end of file
diff --git a/core/management/commands/populate_test_data.py b/core/management/commands/populate_test_data.py
new file mode 100644
index 0000000..ae269f3
--- /dev/null
+++ b/core/management/commands/populate_test_data.py
@@ -0,0 +1,48 @@
+from django.core.management.base import BaseCommand
+from django.db import transaction
+from purchase.models import Supplier
+from sales.models import Customer
+
+class Command(BaseCommand):
+ help = 'Populate test suppliers and customers'
+
+ def handle(self, *args, **options):
+ # Create test suppliers
+ suppliers_data = [
+ {'name': 'ABC Supplier', 'code': 'SUP001', 'contact_person': 'John Doe', 'email': 'john@abcsupplier.com'},
+ {'name': 'XYZ Supplier', 'code': 'SUP002', 'contact_person': 'Jane Smith', 'email': 'jane@xyzsupplier.com'},
+ {'name': 'Global Parts', 'code': 'SUP003', 'contact_person': 'Bob Johnson', 'email': 'bob@globalparts.com'},
+ ]
+
+ created_suppliers = 0
+ for supplier_data in suppliers_data:
+ supplier, created = Supplier.objects.get_or_create(
+ code=supplier_data['code'],
+ defaults=supplier_data
+ )
+ if created:
+ created_suppliers += 1
+ self.stdout.write(f'Created supplier: {supplier.name}')
+
+ # Create test customers
+ customers_data = [
+ {'name': 'Tech Solutions Inc.', 'code': 'CUST01', 'contact_person': 'Alice Brown', 'email': 'alice@techsolutions.com'},
+ {'name': 'Global Enterprises', 'code': 'CUST002', 'contact_person': 'Charlie Wilson', 'email': 'charlie@globalenterprises.com'},
+ {'name': 'Local Business', 'code': 'CUST03', 'contact_person': 'Diana Prince', 'email': 'diana@localbusiness.com'},
+ ]
+
+ created_customers = 0
+ for customer_data in customers_data:
+ customer, created = Customer.objects.get_or_create(
+ code=customer_data['code'],
+ defaults=customer_data
+ )
+ if created:
+ created_customers += 1
+ self.stdout.write(f'Created customer: {customer.name}')
+
+ self.stdout.write(
+ self.style.SUCCESS(
+ f'Successfully populated test data: {created_suppliers} suppliers, {created_customers} customers'
+ )
+ )
\ No newline at end of file
diff --git a/core/urls.py b/core/urls.py
index 60b5d85..48c7dda 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -10,4 +10,7 @@ urlpatterns = [
path('database/', login_required(views.DatabaseManagementView.as_view()), name='database_management'),
path('database/backup/', login_required(views.backup_database), name='backup_database'),
path('database/restore/', login_required(views.restore_database), name='restore_database'),
+ path('database/change-password/', login_required(views.change_password), name='change_password'),
+ path('test-form/', login_required(views.test_form), name='test_form'),
+ path('simple-test/', login_required(views.simple_test), name='simple_test'),
]
diff --git a/core/views.py b/core/views.py
index 347a987..0fcb9f7 100644
--- a/core/views.py
+++ b/core/views.py
@@ -8,10 +8,12 @@ from django.conf import settings
import sqlite3
import os
import shutil
+import sys
from datetime import datetime, timedelta
from django.utils import timezone
from django.db.models import Sum, Count, Avg
from decimal import Decimal
+from pathlib import Path
from inventory.models import Product, StockMovement
from purchase.models import PurchaseOrder, PurchaseOrderItem
@@ -152,19 +154,33 @@ class DatabaseManagementView(TemplateView):
context = super().get_context_data(**kwargs)
# Database file information
- db_path = os.path.join(settings.BASE_DIR, 'db.sqlite3')
+ # Use the same path logic as in settings.py
+ if getattr(sys, 'frozen', False):
+ # Running as compiled executable
+ base_db_dir = Path(os.path.dirname(sys.executable))
+ else:
+ # Running as script
+ base_db_dir = settings.BASE_DIR
+ db_path = base_db_dir / 'db.sqlite3'
if os.path.exists(db_path):
stat = os.stat(db_path)
context['db_size'] = f"{stat.st_size / (1024*1024):.2f} MB"
context['db_modified'] = datetime.fromtimestamp(stat.st_mtime).strftime('%Y-%m-%d %H:%M:%S')
# Available backups
- backup_dir = os.path.join(settings.BASE_DIR, 'backups')
+ # Use the same path logic as in settings.py
+ if getattr(sys, 'frozen', False):
+ # Running as compiled executable
+ base_db_dir = Path(os.path.dirname(sys.executable))
+ else:
+ # Running as script
+ base_db_dir = settings.BASE_DIR
+ backup_dir = base_db_dir / 'backups'
if os.path.exists(backup_dir):
backups = []
for file in os.listdir(backup_dir):
if file.endswith('.sqlite3'):
- file_path = os.path.join(backup_dir, file)
+ file_path = backup_dir / file
stat = os.stat(file_path)
backups.append({
'name': file,
@@ -200,17 +216,25 @@ class DatabaseManagementView(TemplateView):
def backup_database(request):
if request.method == 'POST':
try:
+ # Use the same path logic as in settings.py
+ if getattr(sys, 'frozen', False):
+ # Running as compiled executable
+ base_db_dir = Path(os.path.dirname(sys.executable))
+ else:
+ # Running as script
+ base_db_dir = settings.BASE_DIR
+
# Create backup directory if it doesn't exist
- backup_dir = os.path.join(settings.BASE_DIR, 'backups')
+ backup_dir = base_db_dir / 'backups'
os.makedirs(backup_dir, exist_ok=True)
# Generate backup filename with timestamp
timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
backup_filename = f'manufacture_app_backup_{timestamp}.sqlite3'
- backup_path = os.path.join(backup_dir, backup_filename)
+ backup_path = backup_dir / backup_filename
# Copy the database file
- db_path = os.path.join(settings.BASE_DIR, 'db.sqlite3')
+ db_path = base_db_dir / 'db.sqlite3'
shutil.copy2(db_path, backup_path)
messages.success(request, f'Database backed up successfully to {backup_filename}')
@@ -219,17 +243,147 @@ def backup_database(request):
return redirect('core:database_management')
+def test_form(request):
+ """Test view to isolate form rendering issue"""
+ # Check database connectivity
+ db_connected = False
+ db_error = None
+ try:
+ from django.db import connection
+ connection.ensure_connection()
+ db_connected = True
+ except Exception as e:
+ db_error = str(e)
+
+ from purchase.forms import PurchaseOrderForm
+ from sales.forms import SaleOrderForm
+
+ purchase_form = PurchaseOrderForm()
+ sales_form = SaleOrderForm()
+
+ # Check if suppliers/customers are available
+ suppliers = []
+ customers = []
+ supplier_count = 0
+ customer_count = 0
+ model_error = None
+
+ try:
+ from purchase.models import Supplier
+ from sales.models import Customer
+ suppliers = Supplier.objects.all()
+ customers = Customer.objects.all()
+ supplier_count = suppliers.count()
+ customer_count = customers.count()
+ except Exception as e:
+ model_error = str(e)
+
+ # Debug information
+ purchase_form_debug = {
+ 'field_type': type(purchase_form.fields['supplier']).__name__,
+ 'choices_count': len(purchase_form.fields['supplier'].choices) if hasattr(purchase_form.fields['supplier'], 'choices') else 'N/A',
+ 'choices': list(purchase_form.fields['supplier'].choices) if hasattr(purchase_form.fields['supplier'], 'choices') else [],
+ }
+
+ sales_form_debug = {
+ 'field_type': type(sales_form.fields['customer']).__name__,
+ 'choices_count': len(sales_form.fields['customer'].choices) if hasattr(sales_form.fields['customer'], 'choices') else 'N/A',
+ 'choices': list(sales_form.fields['customer'].choices) if hasattr(sales_form.fields['customer'], 'choices') else [],
+ }
+
+ context = {
+ 'purchase_form': purchase_form,
+ 'sales_form': sales_form,
+ 'suppliers': suppliers,
+ 'customers': customers,
+ 'supplier_count': supplier_count,
+ 'customer_count': customer_count,
+ 'db_connected': db_connected,
+ 'db_error': db_error,
+ 'model_error': model_error,
+ 'purchase_form_debug': purchase_form_debug,
+ 'sales_form_debug': sales_form_debug,
+ }
+
+ return render(request, 'core/test_form.html', context)
+
+@login_required
+@user_passes_test(is_admin)
+def change_password(request):
+ if request.method == 'POST':
+ try:
+ username = request.POST.get('username')
+ new_password = request.POST.get('new_password')
+ confirm_password = request.POST.get('confirm_password')
+
+ if not username:
+ messages.error(request, 'Username is required.')
+ return redirect('core:database_management')
+
+ if not new_password:
+ messages.error(request, 'New password is required.')
+ return redirect('core:database_management')
+
+ if new_password != confirm_password:
+ messages.error(request, 'Passwords do not match.')
+ return redirect('core:database_management')
+
+ # Validate password length
+ if len(new_password) < 8:
+ messages.error(request, 'Password must be at least 8 characters long.')
+ return redirect('core:database_management')
+
+ # Get user and change password
+ from django.contrib.auth import get_user_model
+ User = get_user_model()
+
+ try:
+ user = User.objects.get(username=username)
+ user.set_password(new_password)
+ user.save()
+ messages.success(request, f'Successfully changed password for user "{username}"')
+ except User.DoesNotExist:
+ messages.error(request, f'User "{username}" does not exist.')
+ except Exception as e:
+ messages.error(request, f'Failed to change password: {str(e)}')
+
+ return redirect('core:database_management')
+
+@login_required
+def simple_test(request):
+ """Simple test view to isolate form rendering issue"""
+ from purchase.forms import PurchaseOrderForm
+ from sales.forms import SaleOrderForm
+
+ purchase_form = PurchaseOrderForm()
+ sales_form = SaleOrderForm()
+
+ context = {
+ 'purchase_form': purchase_form,
+ 'sales_form': sales_form,
+ }
+
+ return render(request, 'core/simple_test.html', context)
+
@login_required
@user_passes_test(is_admin)
def restore_database(request):
if request.method == 'POST':
try:
+ # Use the same path logic as in settings.py
+ if getattr(sys, 'frozen', False):
+ # Running as compiled executable
+ base_db_dir = Path(os.path.dirname(sys.executable))
+ else:
+ # Running as script
+ base_db_dir = settings.BASE_DIR
+
backup_file = request.FILES.get('backup_file')
if backup_file:
# Create backup of current database first
- current_db = os.path.join(settings.BASE_DIR, 'db.sqlite3')
+ current_db = base_db_dir / 'db.sqlite3'
timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
- safety_backup = os.path.join(settings.BASE_DIR, f'safety_backup_{timestamp}.sqlite3')
+ safety_backup = base_db_dir / f'safety_backup_{timestamp}.sqlite3'
shutil.copy2(current_db, safety_backup)
# Restore from uploaded backup
diff --git a/db.sqlite3 b/db.sqlite3
index 625f830..587f20c 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/dist/start_server.exe b/dist/start_server.exe
index dd6d413..00ffe63 100644
Binary files a/dist/start_server.exe and b/dist/start_server.exe differ
diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc
index b19b26e..61707b2 100644
Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ
diff --git a/inventory/forms.py b/inventory/forms.py
index 3dac55c..fe35dd7 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -27,7 +27,7 @@ class SupplierForm(forms.ModelForm):
class Meta:
model = Supplier
- fields = ['code', 'name', 'contact_person', 'email', 'phone', 'address', 'rating', 'credit_limit', 'is_active']
+ fields = ['code', 'name', 'contact_person', 'email', 'phone', 'address', 'credit_limit', 'is_active']
widgets = {
'address': forms.Textarea(attrs={'rows': 3}),
}
diff --git a/inventory/models.py b/inventory/models.py
index c833d56..85838ef 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -234,10 +234,6 @@ class Supplier(models.Model):
email = models.EmailField(blank=True)
phone = models.CharField(max_length=20, blank=True)
address = models.TextField(blank=True)
- rating = models.PositiveSmallIntegerField(
- validators=[MinValueValidator(1), MaxValueValidator(5)],
- default=3
- )
credit_limit = models.DecimalField(max_digits=12, decimal_places=2, default=0)
is_active = models.BooleanField(default=True)
created_at = models.DateTimeField(auto_now_add=True)
diff --git a/manufacture/__pycache__/urls.cpython-311.pyc b/manufacture/__pycache__/urls.cpython-311.pyc
index 71c6a04..06147f9 100644
Binary files a/manufacture/__pycache__/urls.cpython-311.pyc and b/manufacture/__pycache__/urls.cpython-311.pyc differ
diff --git a/manufacture/__pycache__/views.cpython-311.pyc b/manufacture/__pycache__/views.cpython-311.pyc
index 005bcb9..7868207 100644
Binary files a/manufacture/__pycache__/views.cpython-311.pyc and b/manufacture/__pycache__/views.cpython-311.pyc differ
diff --git a/manufacture/urls.py b/manufacture/urls.py
index 328ba09..59021f5 100644
--- a/manufacture/urls.py
+++ b/manufacture/urls.py
@@ -8,5 +8,6 @@ urlpatterns = [
path('', views.ManufactureListView.as_view(), name='manufacture_list'),
path('create/', views.manufacture_create, name='manufacture_create'),
path('
/', views.ManufactureDetailView.as_view(), name='manufacture_detail'),
+ path('/edit/', views.manufacture_edit, name='manufacture_edit'),
path('/delete/', views.manufacture_delete, name='manufacture_delete'),
]
diff --git a/manufacture/views.py b/manufacture/views.py
index 203f352..1074b79 100644
--- a/manufacture/views.py
+++ b/manufacture/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
from django.views.generic import ListView, DetailView
from django.contrib.auth.decorators import login_required
from django.utils.decorators import method_decorator
@@ -46,6 +46,31 @@ def manufacture_create(request):
return render(request, 'manufacture/manufacture_form.html', {'form': form, 'title': 'Create Manufacturing Order'})
+@login_required
+def manufacture_edit(request, pk):
+ """Edit an existing manufacturing order"""
+ from users.views import is_administrator
+ if not is_administrator(request.user):
+ messages.error(request, 'You do not have permission to edit manufacturing orders.')
+ return redirect('manufacture:manufacture_detail', pk=pk)
+
+ manufacturing_order = get_object_or_404(ManufacturingOrder, pk=pk)
+
+ if request.method == 'POST':
+ form = ManufacturingOrderForm(request.POST, instance=manufacturing_order)
+ if form.is_valid():
+ form.save()
+ messages.success(request, f'Manufacturing order "{manufacturing_order.order_number}" updated successfully!')
+ return redirect('manufacture:manufacture_detail', pk=manufacturing_order.pk)
+ else:
+ form = ManufacturingOrderForm(instance=manufacturing_order)
+
+ return render(request, 'manufacture/manufacture_form.html', {
+ 'form': form,
+ 'title': 'Edit Manufacturing Order',
+ 'manufacturing_order': manufacturing_order
+ })
+
@login_required
def manufacture_delete(request, pk):
"""Delete a manufacturing order"""
diff --git a/manufacture_app/__pycache__/settings.cpython-311.pyc b/manufacture_app/__pycache__/settings.cpython-311.pyc
index 24367f7..f9d2886 100644
Binary files a/manufacture_app/__pycache__/settings.cpython-311.pyc and b/manufacture_app/__pycache__/settings.cpython-311.pyc differ
diff --git a/manufacture_app/settings.py b/manufacture_app/settings.py
index 30c4acb..8448efd 100644
--- a/manufacture_app/settings.py
+++ b/manufacture_app/settings.py
@@ -69,10 +69,22 @@ TEMPLATES = [
WSGI_APPLICATION = 'manufacture_app.wsgi.application'
# Database
+# When running as executable, database should be in the same directory as the executable
+import sys
+import os
+
+# Check if we're running as a PyInstaller executable
+if getattr(sys, 'frozen', False):
+ # Running as compiled executable
+ BASE_DB_DIR = Path(os.path.dirname(sys.executable))
+else:
+ # Running as script
+ BASE_DB_DIR = BASE_DIR
+
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': BASE_DIR / 'db.sqlite3',
+ 'NAME': BASE_DB_DIR / 'db.sqlite3',
}
}
diff --git a/purchase/__pycache__/admin.cpython-311.pyc b/purchase/__pycache__/admin.cpython-311.pyc
index 2f34dd4..0d0c804 100644
Binary files a/purchase/__pycache__/admin.cpython-311.pyc and b/purchase/__pycache__/admin.cpython-311.pyc differ
diff --git a/purchase/__pycache__/forms.cpython-311.pyc b/purchase/__pycache__/forms.cpython-311.pyc
index 9c1d8cd..bbd7400 100644
Binary files a/purchase/__pycache__/forms.cpython-311.pyc and b/purchase/__pycache__/forms.cpython-311.pyc differ
diff --git a/purchase/__pycache__/models.cpython-311.pyc b/purchase/__pycache__/models.cpython-311.pyc
index cef4835..9e3e63c 100644
Binary files a/purchase/__pycache__/models.cpython-311.pyc and b/purchase/__pycache__/models.cpython-311.pyc differ
diff --git a/purchase/admin.py b/purchase/admin.py
index 1583f98..5599843 100644
--- a/purchase/admin.py
+++ b/purchase/admin.py
@@ -8,9 +8,9 @@ class PurchaseOrderItemInline(admin.TabularInline):
@admin.register(Supplier)
class SupplierAdmin(admin.ModelAdmin):
- list_display = ('name', 'code', 'contact_person', 'email', 'phone',
- 'rating', 'is_active', 'created_at')
- list_filter = ('is_active', 'rating', 'created_at')
+ list_display = ('name', 'code', 'contact_person', 'email', 'phone',
+ 'is_active', 'created_at')
+ list_filter = ('is_active', 'created_at')
search_fields = ('name', 'code', 'contact_person', 'email', 'phone')
ordering = ('name',)
@@ -18,7 +18,7 @@ class SupplierAdmin(admin.ModelAdmin):
('Basic Information', {'fields': ('name', 'code', 'contact_person', 'email', 'phone')}),
('Address', {'fields': ('address',)}),
('Business Information', {'fields': ('tax_id', 'payment_terms', 'credit_limit')}),
- ('Status', {'fields': ('is_active', 'rating')}),
+ ('Status', {'fields': ('is_active',)}),
)
@admin.register(PurchaseOrder)
diff --git a/purchase/forms.py b/purchase/forms.py
index 4ff1ecb..f29c524 100644
--- a/purchase/forms.py
+++ b/purchase/forms.py
@@ -1,6 +1,6 @@
from django import forms
-from .models import PurchaseOrder, PurchaseOrderItem, Supplier
-from inventory.models import Product
+from .models import PurchaseOrder, PurchaseOrderItem
+from inventory.models import Product, Supplier
class PurchaseOrderForm(forms.ModelForm):
"""Form for creating and editing purchase orders"""
@@ -17,7 +17,12 @@ class PurchaseOrderForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- # Add Bootstrap classes
+ # Update the supplier field queryset to only show active suppliers
+ from inventory.models import Supplier
+ self.fields['supplier'].queryset = Supplier.objects.filter(is_active=True).order_by('name')
+ self.fields['supplier'].widget.attrs.update({'class': 'form-control'})
+
+ # Add Bootstrap classes to other fields
for field in self.fields.values():
if isinstance(field.widget, (forms.CheckboxInput, forms.RadioSelect)):
field.widget.attrs.update({'class': 'form-check-input'})
@@ -25,8 +30,10 @@ class PurchaseOrderForm(forms.ModelForm):
field.widget.attrs.update({'class': 'form-control'})
elif isinstance(field.widget, forms.DateInput):
field.widget.attrs.update({'class': 'form-control'})
- else:
+ elif not isinstance(field.widget, forms.Select): # Skip Select widgets as we already handled them
field.widget.attrs.update({'class': 'form-control'})
+
+# Removed _get_supplier_choices method as it's no longer needed
class PurchaseOrderItemForm(forms.ModelForm):
"""Form for purchase order items"""
diff --git a/purchase/models.py b/purchase/models.py
index 106a612..76d1dd4 100644
--- a/purchase/models.py
+++ b/purchase/models.py
@@ -2,52 +2,9 @@ from django.db import models
from django.core.validators import MinValueValidator
from django.utils.translation import gettext_lazy as _
from decimal import Decimal
+from inventory.models import Supplier
-class Supplier(models.Model):
- """Supplier information"""
-
- name = models.CharField(max_length=200)
- code = models.CharField(max_length=50, unique=True, help_text='Unique supplier code')
- contact_person = models.CharField(max_length=100, blank=True)
- email = models.EmailField(blank=True)
- phone = models.CharField(max_length=20, blank=True)
- address = models.TextField(blank=True)
-
- # Business information
- tax_id = models.CharField(max_length=50, blank=True)
- payment_terms = models.CharField(max_length=100, blank=True, help_text='e.g., Net 30, Net 60')
- credit_limit = models.DecimalField(
- max_digits=12,
- decimal_places=2,
- default=0,
- validators=[MinValueValidator(Decimal('0'))]
- )
-
- # Status
- is_active = models.BooleanField(default=True)
- rating = models.IntegerField(
- choices=[(i, i) for i in range(1, 6)],
- default=3,
- help_text='Supplier rating from 1-5'
- )
-
- # Timestamps
- created_at = models.DateTimeField(auto_now_add=True)
- updated_at = models.DateTimeField(auto_now=True)
-
- class Meta:
- ordering = ['name']
- verbose_name = _('Supplier')
- verbose_name_plural = _('Suppliers')
-
- def __str__(self):
- return f"{self.name} ({self.code})"
-
- def get_total_purchases(self):
- """Get total purchases from this supplier"""
- return self.purchase_orders.aggregate(
- total=models.Sum('total_amount')
- )['total'] or Decimal('0')
+# Supplier model removed - using inventory.models.Supplier instead
class PurchaseOrder(models.Model):
"""Purchase order model"""
@@ -61,7 +18,7 @@ class PurchaseOrder(models.Model):
]
order_number = models.CharField(max_length=50, unique=True, help_text='Unique purchase order number')
- supplier = models.ForeignKey(Supplier, on_delete=models.CASCADE, related_name='purchase_orders')
+ supplier = models.ForeignKey('inventory.Supplier', on_delete=models.CASCADE, related_name='purchase_orders')
date = models.DateField()
expected_delivery_date = models.DateField(blank=True, null=True)
status = models.CharField(max_length=20, choices=ORDER_STATUS, default='draft')
diff --git a/sales/__pycache__/admin.cpython-311.pyc b/sales/__pycache__/admin.cpython-311.pyc
index 42cb4a2..6d0adbe 100644
Binary files a/sales/__pycache__/admin.cpython-311.pyc and b/sales/__pycache__/admin.cpython-311.pyc differ
diff --git a/sales/__pycache__/forms.cpython-311.pyc b/sales/__pycache__/forms.cpython-311.pyc
index de4584d..6dde320 100644
Binary files a/sales/__pycache__/forms.cpython-311.pyc and b/sales/__pycache__/forms.cpython-311.pyc differ
diff --git a/sales/__pycache__/models.cpython-311.pyc b/sales/__pycache__/models.cpython-311.pyc
index b526392..585adc6 100644
Binary files a/sales/__pycache__/models.cpython-311.pyc and b/sales/__pycache__/models.cpython-311.pyc differ
diff --git a/sales/admin.py b/sales/admin.py
index 887589c..cedf428 100644
--- a/sales/admin.py
+++ b/sales/admin.py
@@ -1,5 +1,6 @@
from django.contrib import admin
-from .models import Customer, SaleOrder, SaleOrderItem, DeliveryNote
+from .models import SaleOrder, SaleOrderItem, DeliveryNote
+from inventory.models import Customer
class SaleOrderItemInline(admin.TabularInline):
model = SaleOrderItem
@@ -8,9 +9,9 @@ class SaleOrderItemInline(admin.TabularInline):
@admin.register(Customer)
class CustomerAdmin(admin.ModelAdmin):
- list_display = ('name', 'code', 'customer_type', 'contact_person', 'email', 'phone',
- 'rating', 'is_active', 'created_at')
- list_filter = ('customer_type', 'is_active', 'rating', 'created_at')
+ list_display = ('name', 'code', 'customer_type', 'contact_person', 'email', 'phone',
+ 'is_active', 'created_at')
+ list_filter = ('customer_type', 'is_active', 'created_at')
search_fields = ('name', 'code', 'contact_person', 'email', 'phone')
ordering = ('name',)
@@ -18,7 +19,7 @@ class CustomerAdmin(admin.ModelAdmin):
('Basic Information', {'fields': ('name', 'code', 'customer_type', 'contact_person', 'email', 'phone')}),
('Address', {'fields': ('address',)}),
('Business Information', {'fields': ('tax_id', 'payment_terms', 'credit_limit')}),
- ('Status', {'fields': ('is_active', 'rating')}),
+ ('Status', {'fields': ('is_active',)}),
)
@admin.register(SaleOrder)
diff --git a/sales/forms.py b/sales/forms.py
index dc02acc..4e2b28e 100644
--- a/sales/forms.py
+++ b/sales/forms.py
@@ -1,6 +1,6 @@
from django import forms
-from .models import SaleOrder, SaleOrderItem, Customer
-from inventory.models import Product
+from .models import SaleOrder, SaleOrderItem
+from inventory.models import Product, Customer
class SaleOrderForm(forms.ModelForm):
"""Form for creating and editing sales orders"""
@@ -17,7 +17,12 @@ class SaleOrderForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- # Add Bootstrap classes
+ # Update the customer field queryset to only show active customers
+ from inventory.models import Customer
+ self.fields['customer'].queryset = Customer.objects.filter(is_active=True).order_by('name')
+ self.fields['customer'].widget.attrs.update({'class': 'form-control'})
+
+ # Add Bootstrap classes to other fields
for field in self.fields.values():
if isinstance(field.widget, (forms.CheckboxInput, forms.RadioSelect)):
field.widget.attrs.update({'class': 'form-check-input'})
@@ -25,8 +30,10 @@ class SaleOrderForm(forms.ModelForm):
field.widget.attrs.update({'class': 'form-control'})
elif isinstance(field.widget, forms.DateInput):
field.widget.attrs.update({'class': 'form-control'})
- else:
+ elif not isinstance(field.widget, forms.Select): # Skip Select widgets as we already handled them
field.widget.attrs.update({'class': 'form-control'})
+
+# Removed _get_customer_choices method as it's no longer needed
class SaleOrderItemForm(forms.ModelForm):
"""Form for sales order items"""
diff --git a/sales/models.py b/sales/models.py
index 77065c2..00234ac 100644
--- a/sales/models.py
+++ b/sales/models.py
@@ -2,62 +2,9 @@ from django.db import models
from django.core.validators import MinValueValidator
from django.utils.translation import gettext_lazy as _
from decimal import Decimal
+from inventory.models import Customer
-class Customer(models.Model):
- """Customer information"""
-
- CUSTOMER_TYPE_CHOICES = [
- ('retail', 'Retail'),
- ('wholesale', 'Wholesale'),
- ('distributor', 'Distributor'),
- ('corporate', 'Corporate'),
- ]
-
- name = models.CharField(max_length=200)
- code = models.CharField(max_length=50, unique=True, help_text='Unique customer code')
- customer_type = models.CharField(max_length=20, choices=CUSTOMER_TYPE_CHOICES, default='retail')
-
- # Contact information
- contact_person = models.CharField(max_length=100, blank=True)
- email = models.EmailField(blank=True)
- phone = models.CharField(max_length=20, blank=True)
- address = models.TextField(blank=True)
-
- # Business information
- tax_id = models.CharField(max_length=50, blank=True)
- payment_terms = models.CharField(max_length=100, blank=True, help_text='e.g., Net 30, Net 60')
- credit_limit = models.DecimalField(
- max_digits=12,
- decimal_places=2,
- default=0,
- validators=[MinValueValidator(Decimal('0'))]
- )
-
- # Status
- is_active = models.BooleanField(default=True)
- rating = models.IntegerField(
- choices=[(i, i) for i in range(1, 6)],
- default=3,
- help_text='Customer rating from 1-5'
- )
-
- # Timestamps
- created_at = models.DateTimeField(auto_now_add=True)
- updated_at = models.DateTimeField(auto_now=True)
-
- class Meta:
- ordering = ['name']
- verbose_name = _('Customer')
- verbose_name_plural = _('Customers')
-
- def __str__(self):
- return f"{self.name} ({self.code})"
-
- def get_total_sales(self):
- """Get total sales to this customer"""
- return self.sale_orders.aggregate(
- total=models.Sum('total_amount')
- )['total'] or Decimal('0')
+# Customer model removed - using inventory.models.Customer instead
class SaleOrder(models.Model):
"""Sales order model"""
@@ -71,7 +18,7 @@ class SaleOrder(models.Model):
]
order_number = models.CharField(max_length=50, unique=True, help_text='Unique sales order number')
- customer = models.ForeignKey(Customer, on_delete=models.CASCADE, related_name='sale_orders')
+ customer = models.ForeignKey('inventory.Customer', on_delete=models.CASCADE, related_name='sale_orders')
date = models.DateField()
expected_delivery_date = models.DateField(blank=True, null=True)
status = models.CharField(max_length=20, choices=ORDER_STATUS, default='draft')
diff --git a/start_server.py b/start_server.py
index a588bdf..c174ab7 100644
--- a/start_server.py
+++ b/start_server.py
@@ -1,6 +1,146 @@
import os
-from django.core.management import execute_from_command_line
+import sys
+from pathlib import Path
+
+def setup_django():
+ """Set up Django environment"""
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'manufacture_app.settings')
+
+ import django
+ django.setup()
+
+def get_db_path():
+ """Get the database path based on execution mode"""
+ # Check if we're running as a PyInstaller executable
+ if getattr(sys, 'frozen', False):
+ # Running as compiled executable
+ base_db_dir = Path(os.path.dirname(sys.executable))
+ print(f"Running as compiled executable. Database directory: {base_db_dir}")
+ else:
+ # Running as script
+ # Use the same logic as Django settings to determine the base directory
+ # BASE_DIR is the parent of the settings module directory
+ base_db_dir = Path(os.path.dirname(os.path.abspath(__file__))).parent
+ print(f"Running as script. Database directory: {base_db_dir}")
+
+ db_path = base_db_dir / 'db.sqlite3'
+ print(f"Database path: {db_path}")
+
+ # If running as script and the database doesn't exist in the project root,
+ # check if there's one in the current working directory
+ if not getattr(sys, 'frozen', False) and not db_path.exists():
+ cwd_db_path = Path.cwd() / 'db.sqlite3'
+ if cwd_db_path.exists():
+ print(f"Using database from current working directory: {cwd_db_path}")
+ return cwd_db_path
+
+ return db_path
+
+def db_initialized():
+ """Check if the database is initialized by checking if tables exist"""
+ setup_django()
+
+ try:
+ from django.db import connection
+ from django.db.utils import OperationalError
+
+ # Try to connect to the database
+ connection.ensure_connection()
+ print("Database connection established")
+
+ # Check if any tables exist
+ with connection.cursor() as cursor:
+ # For SQLite, we can check the sqlite_master table
+ cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='django_migrations'")
+ result = cursor.fetchone()
+ print(f"django_migrations table exists: {result is not None}")
+ return result is not None
+ except OperationalError as e:
+ print(f"Database connection error: {e}")
+ return False
+ except Exception as e:
+ print(f"Unexpected error checking database: {e}")
+ import traceback
+ traceback.print_exc()
+ return False
+
+def create_default_superuser():
+ """Create a default superuser account"""
+ setup_django()
+
+ try:
+ from django.contrib.auth import get_user_model
+ User = get_user_model()
+
+ # Check if superuser already exists
+ if User.objects.filter(is_superuser=True).exists():
+ print("Superuser already exists. Skipping creation.")
+ return True
+
+ # Create default superuser
+ superuser = User.objects.create_superuser(
+ username='admin',
+ email='admin@example.com',
+ password='admin123'
+ )
+ print("Default superuser created:")
+ print(" Username: admin")
+ print(" Password: admin123")
+ print(" Email: admin@example.com")
+ print("Please change the password after first login!")
+ return True
+ except Exception as e:
+ print(f"Failed to create default superuser: {e}")
+ import traceback
+ traceback.print_exc()
+ return False
+
+def initialize_database():
+ """Initialize the database with migrations and initial data"""
+ print("Initializing database...")
+ setup_django()
+
+ # Check database path from Django settings
+ from django.conf import settings
+ print(f"Django database path: {settings.DATABASES['default']['NAME']}")
+
+ try:
+ from django.core.management import call_command
+
+ # Run migrations
+ print("Applying database migrations...")
+ call_command('migrate', verbosity=1)
+
+ # Create default groups
+ print("Creating default user groups...")
+ call_command('create_default_groups', verbosity=1)
+
+ # Create default superuser
+ print("Creating default superuser...")
+ create_default_superuser()
+
+ print("Database initialization completed successfully.")
+ return True
+ except Exception as e:
+ print(f"Database initialization failed: {e}")
+ import traceback
+ traceback.print_exc()
+ return False
if __name__ == '__main__':
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'manufacture_app.settings')
+ # Check if database exists and is initialized
+ db_path = get_db_path()
+ print(f"Database file exists: {db_path.exists()}")
+ if not db_path.exists() or not db_initialized():
+ print("Database not found or not initialized. Initializing now...")
+ if not initialize_database():
+ print("Failed to initialize database. Exiting.")
+ sys.exit(1)
+ print("Database ready.")
+
+ # Setup Django for running the server
+ setup_django()
+
+ # Start the server
+ from django.core.management import execute_from_command_line
execute_from_command_line(['manage.py', 'runserver', '--noreload'])
\ No newline at end of file
diff --git a/start_server.spec b/start_server.spec
index dae85dc..c991b6d 100644
--- a/start_server.spec
+++ b/start_server.spec
@@ -59,9 +59,70 @@ for app in django_apps:
datas.append((str(file_path), str(relative_path.parent)))
# Add the database
-db_file = base_dir / 'db.sqlite3'
-if db_file.exists():
- datas.append((str(db_file), '.'))
+# Database is now kept external to the executable
+# db_file = base_dir / 'db.sqlite3'
+# if db_file.exists():
+# datas.append((str(db_file), '.'))
+
+# Add crispy forms templates
+try:
+ import crispy_forms
+ crispy_forms_path = Path(crispy_forms.__file__).parent
+ crispy_templates_dir = crispy_forms_path / 'templates'
+ if crispy_templates_dir.exists():
+ for root, dirs, files in os.walk(crispy_templates_dir):
+ for file in files:
+ file_path = Path(root) / file
+ relative_path = file_path.relative_to(crispy_forms_path)
+ datas.append((str(file_path), str(relative_path.parent)))
+except ImportError:
+ pass
+
+# Add crispy bootstrap5 templates
+try:
+ import crispy_bootstrap5
+ crispy_bootstrap5_path = Path(crispy_bootstrap5.__file__).parent
+ crispy_bootstrap5_templates_dir = crispy_bootstrap5_path / 'templates'
+ if crispy_bootstrap5_templates_dir.exists():
+ for root, dirs, files in os.walk(crispy_bootstrap5_templates_dir):
+ for file in files:
+ file_path = Path(root) / file
+ relative_path = file_path.relative_to(crispy_bootstrap5_path)
+ datas.append((str(file_path), str(relative_path.parent)))
+except ImportError:
+ pass
+
+# Add Django templates
+try:
+ import django
+ django_path = Path(django.__file__).parent
+ django_templates_dir = django_path / 'forms' / 'templates'
+ if django_templates_dir.exists():
+ for root, dirs, files in os.walk(django_templates_dir):
+ for file in files:
+ file_path = Path(root) / file
+ relative_path = file_path.relative_to(django_path)
+ datas.append((str(file_path), str(relative_path.parent)))
+except ImportError:
+ pass
+
+# Add more Django templates
+try:
+ import django
+ django_path = Path(django.__file__).parent
+ django_contrib_dir = django_path / 'contrib'
+ if django_contrib_dir.exists():
+ for root, dirs, files in os.walk(django_contrib_dir):
+ # Look for templates directories
+ if 'templates' in dirs:
+ templates_dir = Path(root) / 'templates'
+ for t_root, t_dirs, t_files in os.walk(templates_dir):
+ for file in t_files:
+ file_path = Path(t_root) / file
+ relative_path = file_path.relative_to(django_path)
+ datas.append((str(file_path), str(relative_path.parent)))
+except ImportError:
+ pass
# Hidden imports for Django
hiddenimports = [
@@ -87,6 +148,17 @@ hiddenimports = [
'django.contrib.sessions.apps',
'django.contrib.messages.apps',
'django.contrib.staticfiles.apps',
+ # Additional imports for form rendering
+ 'django.forms',
+ 'django.forms.widgets',
+ 'django.forms.models',
+ 'django.forms.fields',
+ 'django.forms.boundfield',
+ # Additional imports for model relationships
+ 'django.db.models',
+ 'django.db.models.fields',
+ 'django.db.models.fields.related',
+ 'django.db.models.fields.reverse_related',
]
a = Analysis(
diff --git a/templates/core/database_management.html b/templates/core/database_management.html
index 4fe154c..397eaf3 100644
--- a/templates/core/database_management.html
+++ b/templates/core/database_management.html
@@ -76,46 +76,45 @@
-
-