update repo

This commit is contained in:
gitea 2025-01-22 12:25:52 +00:00
parent 64f76c0f1a
commit aa975148db
14 changed files with 254 additions and 528 deletions

View File

@ -16,7 +16,6 @@ from .models import (
Vendor, Vendor,
Customer, Customer,
Car, Car,
CarTransfer,
CarFinance, CarFinance,
CustomCard, CustomCard,
CarRegistration, CarRegistration,
@ -242,14 +241,6 @@ 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):

View File

@ -0,0 +1,16 @@
# 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',
),
]

File diff suppressed because it is too large Load Diff

View File

@ -155,7 +155,19 @@ def create_ledger_entity(sender, instance, created, **kwargs):
balance_type="debit", balance_type="debit",
active=True, active=True,
) )
# Inventory Account
asset_ca_inventory = entity.create_account(
coa_model=coa,
code="1106",
role=roles.ASSET_CA_INVENTORY,
name=_("Inventory"),
balance_type="debit",
active=True,
)
asset_ca_inventory.role_default = True
asset_ca_inventory.save()
# VAT Payable Account # VAT Payable Account
liability_ltl_vat_receivable = entity.create_account( liability_ltl_vat_receivable = entity.create_account(
coa_model=coa, coa_model=coa,
@ -325,7 +337,7 @@ def create_ledger_entity(sender, instance, created, **kwargs):
# Mortgage Payable Account # Mortgage Payable Account
liability_ltl_mortgage_payable = entity.create_account( liability_ltl_mortgage_payable = entity.create_account(
coa_model=coa, coa_model=coa,
code="2203", code="2202",
role=roles.LIABILITY_LTL_MORTGAGE_PAYABLE, role=roles.LIABILITY_LTL_MORTGAGE_PAYABLE,
name=_("Mortgage Payable"), name=_("Mortgage Payable"),
balance_type="credit", balance_type="credit",

View File

@ -13,7 +13,7 @@
<div class="me-3 flex-1 mt-2"> <div class="me-3 flex-1 mt-2">
<h4 class="fs-9 text-body-emphasis">{{ _("System")}}:</h4> <h4 class="fs-9 text-body-emphasis">{{ _("System")}}:</h4>
{% if not notification.is_read %} {% if not notification.is_read %}
<p class="fs-9 text-body-highlight"><span class="far fa-envelope text-success-dark fs-8 me-1"></span><span class="me-1">{{ notification.message|safe }}</span> <span class="ms-2 text-body-tertiary text-opacity-85 fw-bold fs-10 text-end">{{ notification.created|timesince }}</span></p> <p class="fs-9 text-body-highlight"><span class="far fa-envelope text-success-dark fs-8 me-1"></span><span class="me-1">{{ notification.message }}</span> <span class="ms-2 text-body-tertiary text-opacity-85 fw-bold fs-10 text-end">{{ notification.created|timesince }}</span></p>
{% else %} {% else %}
<p class="fs-9 text-body-highlight"><span class="far fa-envelope-open text-danger-dark fs-8 me-1"></span><span>{{ notification.message|safe }}</span> <span class="ms-2 text-body-tertiary text-opacity-85 fw-bold fs-10 text-end">{{ notification.created|timesince }}</span></p> <p class="fs-9 text-body-highlight"><span class="far fa-envelope-open text-danger-dark fs-8 me-1"></span><span>{{ notification.message|safe }}</span> <span class="ms-2 text-body-tertiary text-opacity-85 fw-bold fs-10 text-end">{{ notification.created|timesince }}</span></p>
{% endif %} {% endif %}

View File

@ -344,7 +344,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="" />

View File

@ -291,7 +291,7 @@
<tbody> <tbody>
<tr> <tr>
<td><span class="badge badge-phoenix badge-phoenix-info">Transfer</span></td> <td><span class="badge badge-phoenix badge-phoenix-info">Transfer</span></td>
<td> <td>
{% if car.get_transfer.status == "draft" %} {% if car.get_transfer.status == "draft" %}
<span class="badge badge-phoenix badge-phoenix-warning"> <span class="badge badge-phoenix badge-phoenix-warning">
@ -301,12 +301,12 @@
<span class="badge badge-phoenix badge-phoenix-info"> <span class="badge badge-phoenix badge-phoenix-info">
waiting for dealer acceptance waiting for dealer acceptance
</span> </span>
{% endif %} {% endif %}
</td> </td>
<td>{{ car.get_transfer.from_dealer|title }}</td> <td>{{ car.get_transfer.from_dealer|title }}</td>
<td>{{ car.get_transfer.to_dealer|title }}</td> <td>{{ car.get_transfer.to_dealer|title }}</td>
<td>{{ car.get_transfer.transfer_date|date:"Y-m-d" }}</td> <td>{{ car.get_transfer.transfer_date|date:"Y-m-d" }}</td>
<td> <td>
{% if car.get_transfer.status == "draft" %} {% if car.get_transfer.status == "draft" %}
<a class="btn btn-sm btn-phoenix-success" href="{% url 'transfer_detail' car.get_transfer.pk %}">Approve</a> <a class="btn btn-sm btn-phoenix-success" href="{% url 'transfer_detail' car.get_transfer.pk %}">Approve</a>