diff --git a/db.sqlite3 b/db.sqlite3 index 4bedcf3..b5fffe0 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/invoices/models.py b/invoices/models.py index b61d487..4bf617a 100644 --- a/invoices/models.py +++ b/invoices/models.py @@ -147,8 +147,8 @@ class Quote(NameSlugModel): """مبلغ باقی‌مانده بر اساس پرداخت‌ها""" paid = self.get_paid_amount() remaining = self.final_amount - paid - if remaining < 0: - remaining = Decimal('0') + # if remaining < 0: + # remaining = Decimal('0') return remaining def get_vat_amount(self) -> Decimal: diff --git a/invoices/views.py b/invoices/views.py index 0313143..01b8c48 100644 --- a/invoices/views.py +++ b/invoices/views.py @@ -36,7 +36,7 @@ def quote_step(request, instance_id, step_id): return redirect('processes:request_list') # دریافت آیتم‌ها - items = Item.objects.filter(is_active=True, is_special=False, is_deleted=False).order_by('name') + items = Item.objects.filter(is_active=True, is_special=False, is_deleted=False).order_by('-is_default_in_quotes') existing_quote = Quote.objects.filter(process_instance=instance).first() existing_quote_items = {} if existing_quote: @@ -556,8 +556,8 @@ def add_quote_payment(request, instance_id, step_id): except InvalidOperation: return JsonResponse({'success': False, 'message': 'مبلغ نامعتبر است'}) remaining = quote.get_remaining_amount() - if amount_dec > remaining: - return JsonResponse({'success': False, 'message': 'مبلغ فیش بیشتر از مانده پیش‌فاکتور است'}) + # if amount_dec > remaining: + # return JsonResponse({'success': False, 'message': 'مبلغ فیش بیشتر از مانده پیش‌فاکتور است'}) Payment.objects.create( invoice=invoice,