rebased
This commit is contained in:
parent
44c1f20801
commit
45a937a0b3
@ -16,6 +16,7 @@ from .models import (
|
|||||||
Vendor,
|
Vendor,
|
||||||
Customer,
|
Customer,
|
||||||
Car,
|
Car,
|
||||||
|
CarTransfer,
|
||||||
CarFinance,
|
CarFinance,
|
||||||
CustomCard,
|
CustomCard,
|
||||||
CarRegistration,
|
CarRegistration,
|
||||||
@ -241,6 +242,14 @@ class CarLocationForm(forms.ModelForm):
|
|||||||
"description": forms.Textarea(attrs={"rows": 2, "class": "form-control"}),
|
"description": forms.Textarea(attrs={"rows": 2, "class": "form-control"}),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class CarTransferForm(forms.ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = CarTransfer
|
||||||
|
fields = ["car", "to_dealer", "remarks"]
|
||||||
|
widgets = {
|
||||||
|
"remarks": forms.Textarea(attrs={"rows": 2, "class": "form-control"}),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# Custom Card Form
|
# Custom Card Form
|
||||||
class CustomCardForm(forms.ModelForm):
|
class CustomCardForm(forms.ModelForm):
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
# Generated by Django 5.1.5 on 2025-01-21 12:57
|
|
||||||
|
|
||||||
from django.db import migrations
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('inventory', '0006_cartransferlog_delete_invoicemodelbase'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.DeleteModel(
|
|
||||||
name='CarTransferLog',
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@ -301,7 +301,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% include "notifications.html" %}
|
{% include "notifications.html" %}
|
||||||
|
|
||||||
<li class="nav-item dropdown">
|
<li class="nav-item dropdown">
|
||||||
<a class="nav-link dropdown-toggle" href="#" id="languageDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false" data-bs-auto-close="outside" aria-haspopup="true">
|
<a class="nav-link dropdown-toggle" href="#" id="languageDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false" data-bs-auto-close="outside" aria-haspopup="true">
|
||||||
{% if request.LANGUAGE_CODE == 'ar' %}
|
{% if request.LANGUAGE_CODE == 'ar' %}
|
||||||
@ -344,7 +343,7 @@
|
|||||||
<div class="text-center pt-4 pb-3">
|
<div class="text-center pt-4 pb-3">
|
||||||
|
|
||||||
<div class="avatar avatar-xl">
|
<div class="avatar avatar-xl">
|
||||||
{% if user.dealer.logo %}
|
{% if user.dealer.logo %}
|
||||||
<img class="rounded-circle" src="{{ user.dealer.logo.url }}" alt="" />
|
<img class="rounded-circle" src="{{ user.dealer.logo.url }}" alt="" />
|
||||||
{% elif user.staff.dealer.logo %}
|
{% elif user.staff.dealer.logo %}
|
||||||
<img class="rounded-circle" src="{{ user.staff.dealer.logo.url }}" alt="" />
|
<img class="rounded-circle" src="{{ user.staff.dealer.logo.url }}" alt="" />
|
||||||
|
|||||||
@ -74,7 +74,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="align-middle ps-3">{{ bill.bill_number }}</td>
|
<td class="align-middle ps-3">{{ bill.bill_number }}</td>
|
||||||
<td class="align-middle">{{ bill.bill_status }}</td>
|
<td class="align-middle">
|
||||||
|
{% if bill.bill.status == 'draft' %}
|
||||||
|
<span class="badge badge-phoenix badge-phoenix-warning">
|
||||||
|
{{ bill.bill_status }}
|
||||||
|
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
<td class="align-middle text-end py-3 pe-3">
|
<td class="align-middle text-end py-3 pe-3">
|
||||||
{{bill.vendor.vendor_name}}
|
{{bill.vendor.vendor_name}}
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user