ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes and updates

Browse Source
This commit is contained in:
ismail 2025-09-15 17:45:39 +03:00
parent 9e838e6c3c
commit 4870e1cac9
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inventory/utils.py
View File

@ -1599,15 +1599,10 @@ def _post_sale_and_cogs(invoice, dealer):
entity:EntityModel = invoice.ledger.entity entity:EntityModel = invoice.ledger.entity
# calc = CarFinanceCalculator(invoice) # calc = CarFinanceCalculator(invoice)
data = get_finance_data(invoice, dealer) data = get_finance_data(invoice, dealer)
car = data.get("car") car = data.get("car")
coa:ChartOfAccountModel = entity.get_default_coa() coa:ChartOfAccountModel = entity.get_default_coa()
# cash_acc = (
# entity.get_default_coa_accounts()
# .filter(role_default=True, role=roles.ASSET_CA_CASH)
# .first()
# )
cash_acc = invoice.cash_account or dealer.settings.invoice_cash_account cash_acc = invoice.cash_account or dealer.settings.invoice_cash_account
vat_acc = dealer.settings.invoice_tax_payable_account or entity.get_default_coa_accounts().filter(role_default=True, role=roles.LIABILITY_CL_TAXES_PAYABLE).first() vat_acc = dealer.settings.invoice_tax_payable_account or entity.get_default_coa_accounts().filter(role_default=True, role=roles.LIABILITY_CL_TAXES_PAYABLE).first()
@ -1615,8 +1610,8 @@ def _post_sale_and_cogs(invoice, dealer):
car_rev = dealer.settings.invoice_vehicle_sale_account or entity.get_default_coa_accounts().filter(role_default=True, role=roles.INCOME_OPERATIONAL).first() car_rev = dealer.settings.invoice_vehicle_sale_account or entity.get_default_coa_accounts().filter(role_default=True, role=roles.INCOME_OPERATIONAL).first()
add_rev = dealer.settings.invoice_additional_services_account add_rev = dealer.settings.invoice_additional_services_account
if not add_rev: if not add_rev:
try: try:
add_rev = entity.get_default_coa_accounts().filter(name="After-Sales Services", active=True).first() add_rev = entity.get_default_coa_accounts().filter(name="After-Sales Services", active=True).first()
if not add_rev: if not add_rev:
@ -1696,7 +1691,7 @@ def _post_sale_and_cogs(invoice, dealer):
if car.get_additional_services_amount > 0: if car.get_additional_services_amount > 0:
# Cr Sales – Additional Services # Cr Sales – Additional Services
if not add_rev: if not add_rev:
logger.warning(f"Additional Services account not set for dealer {dealer}. Skipping additional services revenue entry.") logger.warning(f"Additional Services account not set for dealer {dealer}. Skipping additional services revenue entry.")
else: else:
TransactionModel.objects.create( TransactionModel.objects.create(
journal_entry=je_sale, journal_entry=je_sale,

1
templates/header.html
View File

@ -572,7 +572,6 @@
<div class="avatar avatar-l text-center align-middle"> <div class="avatar avatar-l text-center align-middle">
{% if request.is_dealer and user.dealer.logo %} {% if request.is_dealer and user.dealer.logo %}
<img class="rounded-circle" src="{{ user.dealer.logo.url }}" alt="" /> <img class="rounded-circle" src="{{ user.dealer.logo.url }}" alt="" />
<img src="{% if user.dealer.logo %}{{ user.dealer.logo }}{% else %}{% static 'default-image/user.jpg' %}{% endif %}" alt="" class="rounded-circle">
{% elif request.is_staff and request.staff.logo %} {% elif request.is_staff and request.staff.logo %}
<img class="rounded-circle" src="{{ request.staff.thumbnail.url }}" alt="" /> <img class="rounded-circle" src="{{ request.staff.thumbnail.url }}" alt="" />
{% else %} {% else %}