diff --git a/dbtest.sqlite3 b/dbtest.sqlite3 deleted file mode 100644 index 87519031..00000000 Binary files a/dbtest.sqlite3 and /dev/null differ diff --git a/inventory/models.py b/inventory/models.py index b09b282c..5489f212 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -2425,7 +2425,7 @@ class SaleOrder(models.Model): blank=True, ) comments = models.TextField(blank=True, null=True) - formatted_order_id = models.CharField(max_length=10, unique=True, editable=False) + formatted_order_id = models.CharField(max_length=20, unique=True, editable=False) # Status and Dates status = models.CharField( @@ -2735,7 +2735,6 @@ class CustomGroup(models.Model): "itemmodel", "invoicemodel", "vendormodel", - "journalentrymodel", "purchaseordermodel", "estimatemodel", diff --git a/inventory/views.py b/inventory/views.py index 66db30dd..842b665e 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -440,8 +440,16 @@ class ManagerDashboard(LoginRequiredMixin, TemplateView): transfer_cars = models.Car.objects.filter( dealer=dealer, status=models.CarStatusChoices.TRANSFER ).count() - reserved_percentage = reserved_cars / total_cars * 100 - sold_percentage = sold_cars / total_cars * 100 + try: + reserved_percentage = reserved_cars / total_cars * 100 + except ZeroDivisionError as e: + print(f"error: {e}") + try: + sold_percentage = sold_cars / total_cars * 100 + except ZeroDivisionError as e: + print(f"error: {e}") + + qs = ( models.Car.objects.values("id_car_make__name") .annotate(count=Count("id")) @@ -2513,9 +2521,16 @@ def vendorDetailView(request, dealer_slug,slug): :rtype: HttpResponse """ vendor = get_object_or_404(models.Vendor, slug=slug) + dealer=vendor.dealer + cars=Car.objects.filter(dealer=dealer,vendor=vendor) + print(cars) + + return render( request, template_name="vendors/view_vendor.html", context={"vendor": vendor} ) + + class VendorCreateView( @@ -8676,7 +8691,7 @@ class LedgerModelListView(LoginRequiredMixin,PermissionRequiredMixin, ListView, show_visible = False allow_empty = True paginate_by = 30 - permission_required = "django_ledger.view_ledgermodel" + def get_queryset(self): qs = super().get_queryset() @@ -8995,7 +9010,7 @@ class JournalEntryModelTXSDetailView(JournalEntryModelTXSDetailViewBase): """ template_name = "ledger/journal_entry/journal_entry_txs.html" - + @login_required @permission_required("django_ledger.change_ledgermodel", raise_exception=True) diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index e69548e8..f0e71b30 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -44,12 +44,7 @@
{{ bill.vendor.address_1 }}
- + {% if not bill.is_past_due %}{% trans 'Due in' %}: {{ bill.date_due | timeuntil }} @@ -91,12 +93,20 @@