update

haikalbot/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-03-06 01:43
+# Generated by Django 4.2.20 on 2025-03-20 17:15
 
 from django.db import migrations, models
 

haikalbot/migrations/0002_initial.py

@@ -1,7 +1,7 @@
-# Generated by Django 5.1.6 on 2025-03-06 01:43
+# Generated by Django 4.2.20 on 2025-03-20 17:15
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -9,8 +9,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('haikalbot', '0001_initial'),
         ('inventory', '0001_initial'),
+        ('haikalbot', '0001_initial'),
     ]
 
     operations = [

inventory/apps.py

@@ -5,8 +5,8 @@ class InventoryConfig(AppConfig):
     name = 'inventory'
 
     def ready(self):
-        import inventory.signals        
-        # from decimal import Decimal
-        # from inventory.models import VatRate
-        # VatRate.objects.get_or_create(rate=Decimal('0.15'), is_active=True)
-        
+        import inventory.signals
+        from decimal import Decimal
+        from inventory.models import VatRate
+        VatRate.objects.get_or_create(rate=Decimal('0.15'), is_active=True)
+

inventory/migrations/0002_alter_saleorder_payment_method.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-03-16 19:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('inventory', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='saleorder',
-            name='payment_method',
-            field=models.CharField(choices=[('cash', 'Cash'), ('finance', 'Finance'), ('lease', 'Lease'), ('credit_card', 'Credit Card'), ('bank_transfer', 'Bank Transfer'), ('SADAD', 'SADAD')], max_length=20),
-        ),
-    ]

inventory/models.py

@@ -358,8 +358,6 @@ class Car(models.Model):
     vendor = models.ForeignKey(
         VendorModel,
         models.DO_NOTHING,
-        null=True,
-        blank=True,
         related_name="cars",
         verbose_name=_("Vendor"),
     )
@@ -594,6 +592,10 @@ class CarFinance(models.Model):
     def total(self):
         return self.selling_price
 
+    @property
+    def total_additionals_no_vat(self):
+        return sum(x.price for x in self.additional_services.all())
+
     @property
     def total_additionals(self):
         return sum(x.price_ for x in self.additional_services.all())

inventory/signals.py

@@ -19,7 +19,9 @@ from django_ledger.models import (
     CustomerModel,
     JournalEntryModel,
     TransactionModel,
-    LedgerModel
+    LedgerModel,
+    BillModel,
+    ItemTransactionModel
 )
 from . import models
 from django.utils.timezone import now
@@ -623,7 +625,7 @@ def create_ledger_entity(sender, instance, created, **kwargs):
             entity.create_account(coa_model=coa, code="6302", role=roles.EXPENSE_OTHER, name=_("Taxes"), balance_type="debit", active=True)
             entity.create_account(coa_model=coa, code="6303", role=roles.EXPENSE_OTHER, name=_("Foreign Currency Translation"), balance_type="debit", active=True)
             entity.create_account(coa_model=coa, code="6304", role=roles.EXPENSE_OTHER, name=_("Interest Expenses"), balance_type="debit", active=True)
-        
+
 @receiver(post_save, sender=models.Dealer)
 def create_dealer_groups(sender, instance, created, **kwargs):
 
@@ -642,23 +644,21 @@ def create_dealer_groups(sender, instance, created, **kwargs):
 def create_ledger_vendor(sender, instance, created, **kwargs):
     if created:
         entity = EntityModel.objects.filter(name=instance.dealer.name).first()
-
+        additionals = to_dict(instance)
         entity.create_vendor(
             vendor_model_kwargs={
                 "vendor_name": instance.name,
                 "vendor_number": instance.crn,
                 "address_1": instance.address,
                 "phone": instance.phone_number,
+                "email": instance.email,
                 "tax_id_number": instance.vrn,
                 "active": True,
                 "hidden": False,
-                "additional_info": {
-                    "arabic_name": instance.arabic_name,
-                    "contact_person": instance.contact_person,
-                },
+                "additional_info": additionals,
             }
         )
- 
+
         coa = entity.get_default_coa()
         last_account = entity.get_all_accounts().filter(role=roles.LIABILITY_CL_ACC_PAYABLE).order_by('-created').first()
         # code = f"{int(last_account.code)}{1:03d}"
@@ -674,27 +674,39 @@ def create_ledger_vendor(sender, instance, created, **kwargs):
             coa_model=coa,
             balance_type="credit",
             active=True
-        )   
+        )
         print(f"VendorModel created for Vendor: {instance.name}")
-
+    else:
+        additionals = to_dict(instance)
+        entity.get_vendors().filter(email=instance.email).first().update(
+                vendor_name= instance.name,
+                vendor_number= instance.crn,
+                address_1= instance.address,
+                phone= instance.phone_number,
+                email= instance.email,
+                tax_id_number= instance.vrn,
+                additional_info= additionals,
+            )
 
 @receiver(post_save, sender=models.CustomerModel)
 def create_customer_user(sender, instance, created, **kwargs):
     if created:
-        first_name = instance.additional_info.get("customer_info").get("first_name")
-        last_name = instance.additional_info.get("customer_info").get("last_name")
-        user = User.objects.create(
-            username=instance.email,
-            email=instance.email,
-            first_name=first_name if first_name else '',
-            last_name=last_name if last_name else '',
-        )
-        instance.additional_info.update({"user_info": to_dict(user)})
-        user.set_unusable_password()
-        user.save()
-        instance.user = user
-        instance.save()
-
+        try:
+            first_name = instance.additional_info.get("customer_info").get("first_name")
+            last_name = instance.additional_info.get("customer_info").get("last_name")
+            user = User.objects.create(
+                username=instance.email,
+                email=instance.email,
+                first_name=first_name if first_name else '',
+                last_name=last_name if last_name else '',
+            )
+            instance.additional_info.update({"user_info": to_dict(user)})
+            user.set_unusable_password()
+            user.save()
+            instance.user = user
+            instance.save()
+        except Exception as e:
+            print(e)
 
 # Create Item
 @receiver(post_save, sender=models.Car)
@@ -898,11 +910,6 @@ def create_dealer_settings(sender, instance, created, **kwargs):
             bill_prepaid_account=instance.entity.get_all_accounts().filter(role=roles.ASSET_CA_PREPAID).first(),
             bill_unearned_account=instance.entity.get_all_accounts().filter(role=roles.LIABILITY_CL_ACC_PAYABLE).first()
             )
-        
-@receiver(post_save, sender=models.Dealer)
-def check_if_vat_exists(sender, instance, created, **kwargs):
-    if created:
-        models.VatRate.objects.get_create(is_active=True)
 
 # @receiver(post_save, sender=EstimateModel)
 # def update_estimate_status(sender, instance,created, **kwargs):
@@ -934,98 +941,106 @@ def check_if_vat_exists(sender, instance, created, **kwargs):
 @receiver(post_save, sender=models.Dealer)
 def create_make_ledger_accounts(sender, instance, created, **kwargs):
     if created:
-        entity_name = instance.user.dealer.name
-        entity = EntityModel.objects.get(name=entity_name)
+        entity = instance.entity
+        coa = entity.get_default_coa()
 
+        last_account = entity.get_all_accounts().filter(role=roles.ASSET_CA_RECEIVABLES).order_by('-created').first()
+        if len(last_account.code) == 4:
+            code = f"{int(last_account.code)}{1:03d}"
+        elif len(last_account.code) > 4:
+            code = f"{int(last_account.code)+1}"
+
+        for make in models.CarMake.objects.all():
+            entity.create_account(
+                name=make.name,
+                code=code,
+                role=roles.ASSET_CA_RECEIVABLES,
+                coa_model=coa,
+                balance_type="credit",
+                active=True
+            )
 
 # @receiver(post_save, sender=VendorModel)
 # def create_vendor_accounts(sender, instance, created, **kwargs):
 #     if created:
 #         entity = instance.entity_model
+#         coa = entity.get_default_coa()
+
 #         last_account = entity.get_all_accounts().filter(role=roles.LIABILITY_CL_ACC_PAYABLE).order_by('-created').first()
-#         code = str(int(last_account.code) + 1)
-#         account = entity.create_account(
+#         if len(last_account.code) == 4:
+#             code = f"{int(last_account.path)}{1:03d}"
+#         elif len(last_account.code) > 4:
+#             code = f"{int(last_account.path)+1}"
+#         entity.create_account(
 #             name=instance.vendor_name,
 #             code=code,
 #             role=roles.LIABILITY_CL_ACC_PAYABLE,
-#             coa_model=entity.get_default_coa(),
+#             coa_model=coa,
 #             balance_type="credit",
 #             active=True
-#         )   
+#         )
+
+def save_journal(car_finance,ledger,vendor):
+    entity = ledger.entity
+
+    journal = JournalEntryModel.objects.create(
+        posted=False,
+        description=f"Finances of Car:{car_finance.car.vin} for Vendor:{car_finance.car.vendor.vendor_name}",
+        ledger=ledger,
+        locked=False,
+        origin="Payment",
+    )
+    ledger.additional_info["je_number"] = journal.je_number
+    ledger.save()
+
+    inventory_account = entity.get_default_coa_accounts().filter(role=roles.ASSET_CA_INVENTORY).first()
+    vendor_account = entity.get_default_coa_accounts().get(name=vendor.vendor_name)
+    additional_services_account = entity.get_default_coa_accounts().filter(name="Additional Services",role=roles.COGS).first()
+
+    # Debit Inventory Account
+    TransactionModel.objects.create(
+    journal_entry=journal,
+    account=inventory_account,
+    amount=car_finance.cost_price,
+    tx_type='debit'
+    )
+
+    # Credit Vendor Account
+    TransactionModel.objects.create(
+        journal_entry=journal,
+        account=vendor_account,
+        amount=car_finance.cost_price,
+        tx_type='credit',
+
+    )
 
 @receiver(post_save, sender=models.CarFinance)
 def update_finance_cost(sender, instance, created, **kwargs):
-    entity = instance.car.dealer.entity
-    ledger,created = LedgerModel.objects.get_or_create(name=instance.car.vin, entity=entity)
-    vendor = instance.car.vendor
-
     if created:
-        journal = JournalEntryModel.objects.create(
-            posted=False,
-            description=f"Finances of Car:{instance.car.vin} for Vendor:{instance.car.vendor.vendor_name}",
-            ledger=ledger,
-            locked=False,
-            origin="Payment",
-        )
-        ledger.additional_info["je_number"] = journal.je_number
-        ledger.save()
-        
-        inventory_account = entity.get_default_coa_accounts().filter(role=roles.ASSET_CA_INVENTORY).first()
-        vendor_account = entity.get_default_coa_accounts().get(name=vendor.vendor_name)
+        entity = instance.car.dealer.entity
+        vendor = instance.car.vendor
+        name = f"{instance.car.vin}-{instance.car.id_car_make.name}-{instance.car.id_car_model.name}-{instance.car.year}-{vendor.vendor_name}"
+        ledger,_ = LedgerModel.objects.get_or_create(name=name, entity=entity)
+        save_journal(instance,ledger,vendor)
 
-        # Debit Inventory Account                
-        TransactionModel.objects.create(
-        journal_entry=journal,
-        account=inventory_account,
-        amount=instance.total + instance.total_additionals,
-        tx_type='debit'
-        )   
-
-        # Credit Vendor Account
-        TransactionModel.objects.create(
-            journal_entry=journal,
-            account=vendor_account,
-            amount=instance.cost_price,
-            tx_type='credit'
-        )
-    else:
-        if not ledger.additional_info.get("je_number"):
-            journal = JournalEntryModel.objects.create(
-                posted=False,
-                description=f"Finances of Car:{instance.car.vin} for Vendor:{instance.car.vendor.vendor_name}",
-                ledger=ledger,
-                locked=False,
-                origin="Payment",
-            )
-            ledger.additional_info["je_number"] = journal.je_number
-            ledger.save()
-
-            inventory_account = entity.get_default_coa_accounts().filter(role=roles.ASSET_CA_INVENTORY).first()
-            vendor_account = entity.get_default_coa_accounts().get(name=vendor.vendor_name, active=True)
-
-            # Debit Inventory Account                
-            TransactionModel.objects.create(
-            journal_entry=journal,
-            account=inventory_account,
-            amount=instance.cost_price,
-            tx_type='debit'
-            )   
-
-            # Credit Vendor Account
-            TransactionModel.objects.create(
-                journal_entry=journal,
-                account=vendor_account,
-                amount=instance.cost_price,
-                tx_type='credit'
-            )
-
-        else:
-            journal = JournalEntryModel.objects.filter(je_number=ledger.additional_info.get("je_number")).first()
-            debit = journal.get_transaction_queryset().filter(tx_type='debit').first()
-            credit = journal.get_transaction_queryset().filter(tx_type='credit').first()
-            
-            debit.amount = instance.cost_price
-            credit.amount = instance.cost_price
-            
-            debit.save()
-            credit.save()
+    # if not created:
+    #     if ledger.additional_info.get("je_number"):
+    #         journal = JournalEntryModel.objects.filter(je_number=ledger.additional_info.get("je_number")).first()
+    #         journal.description = f"Finances of Car:{instance.car.vin} for Vendor:{instance.car.vendor.vendor_name}"
+    #         journal.save()
+    #         debit = journal.get_transaction_queryset().filter(tx_type='debit').first()
+    #         credit = journal.get_transaction_queryset().filter(tx_type='credit').first()
+    #         if debit and credit:
+    #             if journal.is_locked():
+    #                 journal.mark_as_unlocked()
+    #                 journal.save()
+    #                 debit.amount = instance.cost_price
+    #                 credit.amount = instance.cost_price
+    #                 debit.save()
+    #                 credit.save()
+    #         else:
+    #             save_journal(instance,ledger,vendor,journal=journal)
+    #     else:
+    #         save_journal(instance,ledger,vendor)
+    # else:
+    #     save_journal(instance,ledger,vendor)

inventory/urls.py

@@ -134,7 +134,7 @@ urlpatterns = [
         views.lead_transfer,
         name="lead_transfer",
     ),
-    
+
     path(
         "crm/opportunities/<int:pk>/add_note/",
         views.add_note_to_opportunity,
@@ -346,7 +346,7 @@ path(
     #     views.payment_create,
     #     name="payment_create",
     # ),
-    
+
     # Users URLs
     path("user/create/", views.UserCreateView.as_view(), name="user_create"),
     path("user/<int:pk>/update/", views.UserUpdateView.as_view(), name="user_update"),
@@ -415,7 +415,7 @@ path(
     # Ledger
     path(
         "ledgers/", views.LedgerModelListView.as_view(), name="ledger_list"
-    ),    
+    ),
     path(
         "ledgers/<slug:entity_slug>/detail/<uuid:pk>/", views.LedgerModelDetailView.as_view(), name="ledger_detail"
     ),
@@ -436,10 +436,10 @@ path(
     # ),
     path(
         "journalentries/<uuid:pk>/list/", views.JournalEntryListView.as_view(), name="journalentry_list"
-    ),    
+    ),
     path(
         "journalentries/<uuid:pk>/create/", views.JournalEntryCreateView.as_view(), name="journalentry_create"
-    ),    
+    ),
     path(
         "journalentries/<uuid:pk>/delete/", views.JournalEntryDeleteView, name="journalentry_delete"
     ),
@@ -640,11 +640,11 @@ path(
         views.bill_mark_as_paid,
         name="bill_mark_as_paid",
     ),
-    
-    
+
+
     # orders
     path("orders/", views.OrderListView.as_view(), name="order_list_view"),
-    
+
     # BALANCE SHEET Reports...
     # Entities...
     path('entity/<slug:entity_slug>/balance-sheet/',

inventory/utils.py

@@ -97,7 +97,7 @@ def send_email(from_, to_, subject, message):
     send_mail(subject, message, from_email, recipient_list)
 
 
-def get_user_type(request):    
+def get_user_type(request):
     if request.is_dealer:
         return request.user.dealer
     elif request.is_staff:
@@ -286,7 +286,7 @@ def get_financial_values(model):
 
 def set_invoice_payment(dealer, entity, invoice, amount, payment_method):
     calculator = CarFinanceCalculator(invoice)
-    finance_data = calculator.get_finance_data()  
+    finance_data = calculator.get_finance_data()
 
     # journal = JournalEntryModel.objects.create(
     #     posted=False,
@@ -295,11 +295,11 @@ def set_invoice_payment(dealer, entity, invoice, amount, payment_method):
     #     locked=False,
     #     origin="Payment",
     # )
-    
+
     # credit_account = entity.get_default_coa_accounts().get(name="Sales Revenue")
     # debit_account = entity.get_default_coa_accounts().get(name="Cash", active=True)
     # vat_payable_account = entity.get_default_coa_accounts().get(name="VAT Payable", active=True)
-    
+
     # TransactionModel.objects.create(
     #     journal_entry=journal,
     #     account=debit_account,  # Debit Account
@@ -316,7 +316,7 @@ def set_invoice_payment(dealer, entity, invoice, amount, payment_method):
     #     description="Payment Received",
     # )
 
-    
+
     # TransactionModel.objects.create(
     #     journal_entry=journal,
     #     account=vat_payable_account,  # Credit VAT Payable
@@ -457,7 +457,7 @@ class CarTransfer:
 
         self._add_car_item_to_invoice()
 
-    def _add_car_item_to_invoice(self):        
+    def _add_car_item_to_invoice(self):
         self.item = self.from_dealer.entity.get_items_products().filter(name=self.car.vin).first()
         if not self.item:
             return
@@ -475,7 +475,7 @@ class CarTransfer:
             commit=True,
             operation=InvoiceModel.ITEMIZE_APPEND,
         )
-        
+
         if self.invoice.can_review():
             self.invoice.mark_as_review()
             self.invoice.mark_as_approved(self.from_dealer.entity.slug, self.from_dealer.entity.admin)
@@ -759,26 +759,26 @@ class CarFinanceCalculator:
             "make": car_info.get('make'),
             "model": car_info.get('model'),
             "year": car_info.get('year'),
-            "trim": car_info.get('trim'),  
+            "trim": car_info.get('trim'),
             "mileage": car_info.get('mileage'),
             "cost_price": car_finance.get('cost_price'),
             "selling_price": car_finance.get('selling_price'),
             "discount": car_finance.get('discount_amount'),
             "quantity": quantity,
-            "unit_price": unit_price,            
+            "unit_price": unit_price,
             "total": unit_price * Decimal(quantity),
             "total_vat": car_finance.get('total_vat'),
             "additional_services": self._get_nested_value(item, self.ADDITIONAL_SERVICES_KEY),
         }
 
-    
+
     def _get_additional_services(self):
         return [
             {"name": service.get('name'), "price": service.get('price'), "taxable": service.get('taxable'),"price_": service.get('price_')}
             for item in self.item_transactions
             for service in self._get_nested_value(item, self.ADDITIONAL_SERVICES_KEY) or []
-        ]    
-    
+        ]
+
     def calculate_totals(self):
         total_price = sum(
             Decimal(self._get_nested_value(item, self.CAR_FINANCE_KEY, 'selling_price')) *
@@ -786,14 +786,14 @@ class CarFinanceCalculator:
             for item in self.item_transactions
         )
         total_additionals = sum(Decimal(x.get('price_')) for x in self._get_additional_services())
-        
+
         total_discount = sum(
             Decimal(self._get_nested_value(item, self.CAR_FINANCE_KEY, 'discount_amount'))
             for item in self.item_transactions
         )
         total_price_discounted = total_price - total_discount
         total_vat_amount = total_price_discounted * self.vat_rate
-        
+
         return {
             "total_price": round(total_price_discounted, 2),  # total_price_discounted,
             "total_vat_amount": round(total_vat_amount, 2),  # total_vat_amount,
@@ -856,7 +856,7 @@ def handle_account_process(invoice,amount,finance_data):
         car = models.Car.objects.get(vin=invoice.get_itemtxs_data()[0].first().item_model.name)
         entity = invoice.ledger.entity
         coa = entity.get_default_coa()
-        
+
         make_account = entity.get_all_accounts().filter(name=car.id_car_make.name,role=roles.COGS).first()
         if not make_account:
             last_account = entity.get_all_accounts().filter(role=roles.COGS).order_by('-created').first()
@@ -864,8 +864,8 @@ def handle_account_process(invoice,amount,finance_data):
                 code = f"{int(last_account.code)}{1:03d}"
             elif len(last_account.code) > 4:
                 code = f"{int(last_account.code)+1}"
-                
-            make_account = entity.create_account(            
+
+            make_account = entity.create_account(
                 name=car.id_car_make.name,
                 code=code,
                 role=roles.COGS,
@@ -873,7 +873,7 @@ def handle_account_process(invoice,amount,finance_data):
                 balance_type="debit",
                 active=True
                 )
-        
+
         # get or create additional services account
         additional_services_account = entity.get_default_coa_accounts().filter(name="Additional Services",role=roles.COGS).first()
         if not additional_services_account:
@@ -882,8 +882,8 @@ def handle_account_process(invoice,amount,finance_data):
                 code = f"{int(last_account.code)}{1:03d}"
             elif len(last_account.code) > 4:
                 code = f"{int(last_account.code)+1}"
-                
-            additional_services_account = entity.create_account(            
+
+            additional_services_account = entity.create_account(
                 name="Additional Services",
                 code=code,
                 role=roles.COGS,
@@ -891,12 +891,12 @@ def handle_account_process(invoice,amount,finance_data):
                 balance_type="debit",
                 active=True
                 )
-        
+
         inventory_account = entity.get_default_coa_accounts().filter(role=roles.ASSET_CA_INVENTORY).first()
-        
+
         vat_payable_account = entity.get_default_coa_accounts().get(name="VAT Payable", active=True)
-        
-        
+
+
         journal = JournalEntryModel.objects.create(
             posted=False,
             description=f"Payment for Invoice {invoice.invoice_number}",
@@ -904,7 +904,7 @@ def handle_account_process(invoice,amount,finance_data):
             locked=False,
             origin="Payment",
         )
-        
+
         TransactionModel.objects.create(
             journal_entry=journal,
             account=make_account,  # Debit car make Account
@@ -926,12 +926,38 @@ def handle_account_process(invoice,amount,finance_data):
             amount=Decimal(car.finances.total),
             tx_type="credit",
             description="Account Adjustment",
-        )        
-        
+        )
+
         TransactionModel.objects.create(
             journal_entry=journal,
             account=vat_payable_account,  # Credit VAT Payable
             amount=finance_data.get("total_vat_amount"),
             tx_type="credit",
             description="VAT Payable on Invoice",
+            )
+
+def create_make_accounts(dealer):
+    entity = dealer.entity
+    coa = entity.get_default_coa()
+
+    # Create a unique account name for the dealer and car make combination
+    makes = models.DealersMake.objects.filter(dealer=dealer).all()
+    for make in makes:
+        account_name = f"{make.car_make.name} Inventory Account"
+
+        account = entity.get_all_accounts().filter(coa_model=coa,name=account_name).first()
+        if not account:
+            last_account = entity.get_all_accounts().filter(role=roles.ASSET_CA_INVENTORY).order_by('-created').first()
+            if len(last_account.code) == 4:
+                code = f"{int(last_account.code)}{1:03d}"
+            elif len(last_account.code) > 4:
+                code = f"{int(last_account.code)+1}"
+
+            account = entity.create_account(
+                name=account_name,
+                code=code,
+                role=roles.ASSET_CA_INVENTORY,
+                coa_model=coa,
+                balance_type="credit",
+                active=True
             )

inventory/views.py

@@ -127,6 +127,7 @@ from .services import (
 )
 from .utils import (
     CarFinanceCalculator,
+    create_make_accounts,
     get_car_finance_data,
     get_financial_values,
     get_item_transactions,
@@ -136,6 +137,7 @@ from .utils import (
     set_bill_payment,
     set_invoice_payment,
     CarTransfer,
+    to_dict,
 )
 
 #####################################################################
@@ -1504,13 +1506,31 @@ class VendorUpdateView(
     SuccessMessageMixin,
     UpdateView,
 ):
-    model = models.Vendor
+    model = VendorModel
     form_class = forms.VendorForm
     template_name = "vendors/vendor_form.html"
     success_url = reverse_lazy("vendor_list")
     success_message = _("Vendor updated successfully.")
 
+    def get_initial(self):
+        initial = super().get_initial()
+        initial = self.object.additional_info
+        return initial
 
+    def form_valid(self, form):
+        instance = form.save(commit=False)
+
+        instance.vendor_name = self.request.POST["name"]
+        instance.vendor_number = self.request.POST["crn"]
+        instance.address_1 = self.request.POST["address"]
+        instance.phone = self.request.POST["phone_number"]
+        instance.email = self.request.POST["email"]
+        instance.tax_id_number = self.request.POST["vrn"]
+        additionals = form.cleaned_data
+        additionals['phone_number'] = str(additionals['phone_number'])
+        instance.additional_info = additionals
+        instance.save()
+        return super().form_valid(form)
 @login_required
 def delete_vendor(request, pk):
     vendor = get_object_or_404(models.Vendor, pk=pk)
@@ -4052,6 +4072,7 @@ def assign_car_makes(request):
         form = forms.DealersMakeForm(request.POST, dealer=dealer)
         if form.is_valid():
             form.save()
+            create_make_accounts(dealer)
             return redirect("dealer_detail", pk=dealer.pk)
     else:
         # Pre-fill the form with existing selections
@@ -4070,8 +4091,9 @@ class LedgerModelListView(LoginRequiredMixin, ListView,ArchiveIndexView):
     show_all = False
     show_current = False
     show_visible = False
+    allow_empty = True
+
 
-    
     def get_queryset(self):
         qs = super().get_queryset()
         dealer = get_user_type(self.request)
@@ -4091,51 +4113,51 @@ class LedgerModelDetailView(LoginRequiredMixin, DetailView):
     model = LedgerModel
     context_object_name = "ledger"
     template_name = "ledger/ledger/ledger_detail.html"
-    
+
 
 # class LedgerModelCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView):
 #     model = LedgerModel
 #     template_name = "ledger/ledger/ledger_form.html"
 #     form_class = forms.LedgerModelCreateForm
 #     success_message = "Ledger created"
-    
+
 #     def get_form(self, form_class=None):
 #         dealer = get_user_type(self.request)
 #         form = forms.LedgerModelCreateForm(entity_slug=dealer.entity.slug,user_model=dealer.entity.admin,**self.get_form_kwargs())
 #         return form
 #     def get_success_url(self):
 #         return reverse('ledger_list')
-    
+
 #     def form_valid(self, form):
 #         instance = form.save(commit=False)
 #         dealer = get_user_type(self.request)
 #         instance.entity = dealer.entity
-#         instance.save()        
+#         instance.save()
 #         return super().form_valid(form)
 
 class JournalEntryListView(LoginRequiredMixin, ListView):
     model = JournalEntryModel
     context_object_name = "journal_entries"
     template_name = "ledger/journal_entry/journal_entry_list.html"
-    
+
     def get_queryset(self):
         qs = super().get_queryset()
         ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
         qs = qs.filter(ledger=ledger)
         return qs
-    
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['ledger'] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
         return context
-    
+
 class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView):
     model = JournalEntryModel
     template_name = "ledger/journal_entry/journal_entry_form.html"
     form_class = forms.JournalEntryModelCreateForm
     ledger_model = None
     success_message = "Journal Entry created"
-    
+
     def get_form(self, form_class=None):
         dealer = get_user_type(self.request)
         ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
@@ -4150,11 +4172,11 @@ class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView)
         context = super().get_context_data(**kwargs)
         context["ledger"] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
         return context
-    
+
     def get_success_url(self):
         ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
         return reverse("journalentry_list", kwargs={"pk": ledger.pk})
-        
+
 
 def JournalEntryDeleteView(request,pk):
     journal_entry = get_object_or_404(JournalEntryModel, pk=pk)
@@ -4182,7 +4204,7 @@ def JournalEntryTransactionsView(request, pk):
 
 class JournalEntryModelTXSDetailView(JournalEntryModelTXSDetailViewBase):
     template_name = 'ledger/journal_entry/journal_entry_txs.html'
-    
+
 
 def ledger_lock_all_journals(request,entity_slug,pk):
     ledger = LedgerModel.objects.filter(pk=pk).first()
@@ -4199,7 +4221,7 @@ def ledger_unlock_all_journals(request,entity_slug,pk):
     if not ledger.is_locked():
         messages.error(request, "Ledger is already Unlocked.")
         return redirect("journalentry_list", pk=ledger.pk)
-    
+
     ledger.unlock()
     ledger.save()
     qs = ledger.journal_entries.locked()
@@ -4224,10 +4246,10 @@ def ledger_unpost_all_journals(request,entity_slug,pk):
         messages.error(request, "Ledger is already Unposted.")
         return redirect("journalentry_list", pk=ledger.pk)
     qs = ledger.journal_entries.posted()
-    for je in qs:        
+    for je in qs:
         je.mark_as_unposted()
         je.save()
-        
+
     ledger.unpost()
     ledger.save()
     return redirect("journalentry_list", pk=ledger.pk)

requirements.txt

@@ -29,8 +29,6 @@ commonmark
 contourpy
 crispy-bootstrap5
 cryptography
-cssselect2
-ctranslate2
 cycler
 Cython
 decorator

scripts/generate.py

@@ -1,4 +1,5 @@
 from inventory.models import *
+from django_ledger.models import VendorModel
 from rich import print
 import random
 import datetime
@@ -8,6 +9,9 @@ from inventory.services import decodevin
 
 def run():
     # car = Car.objects.filter(vin='2C3HD46R4WH170267')
+    dealer = Dealer.objects.first()
+    vendors = [VendorModel.objects.create(vendor_name=f'vendor{i}',entity_model=dealer.entity) for i in  range(1, 5)]
+
     vin_list = [
         "1B3ES56C13D120225",
         "1GB4KYC86FF131536",
@@ -24,8 +28,8 @@ def run():
     ]
     for vin in vin_list:
         try:
-            for _ in range(15):
-                dealer = Dealer.objects.get(user__email="ismail.mosa.ibrahim@gmail.com")
+            for _ in range(5):
+
                 vin = f"{vin[:-4]}{random.randint(0, 9)}{random.randint(0, 9)}{random.randint(0, 9)}{random.randint(0, 9)}"
                 result = decodevin(vin)
                 make = CarMake.objects.get(name=result["maker"])
@@ -35,13 +39,14 @@ def run():
                 year = result["modelYear"]
                 serie = random.choice(model.carserie_set.all())
                 trim = random.choice(serie.cartrim_set.all())
-
+                vendor = random.choice(vendors)
                 car = Car.objects.create(
                     vin=vin,
                     id_car_make=make,
                     id_car_model=model,
                     id_car_serie=serie,
                     id_car_trim=trim,
+                    vendor=vendor,
                     year=(int(year) or 2025),
                     receiving_date=datetime.datetime.now(),
                     dealer=dealer,

templates/vendors/vendors_list.html

@@ -118,7 +118,7 @@
                           <div class="d-flex align-items-center">
                             <p class="mb-0 text-body-highlight fw-semibold fs-9 me-2">{{ vendor.vendor_name }}</p><span class="badge badge-phoenix badge-phoenix-primary">{{ vendor.id}}</span>
                           </div>
-                        </div> 
+                        </div>
                       </div>
                     </td>
                     <td class="email align-middle white-space-nowrap fw-semibold ps-4 border-end border-translucent"><a class="text-body-highlight" href="">{{ vendor.email }}</a></td>
@@ -130,11 +130,12 @@
                     <td class="align-middle white-space-nowrap text-end pe-0 ps-4">
                       <div class="btn-reveal-trigger position-static">
                         <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
-                         <div class="dropdown-menu dropdown-menu-end py-2"><a href="" class="dropdown-item text-success-dark">
+                         <div class="dropdown-menu dropdown-menu-end py-2">
+                                  <a href="{% url 'vendor_update' vendor.pk %}" class="dropdown-item text-success-dark">
                                        {% trans "Edit" %}
                                     </a>
                           <div class="dropdown-divider"></div><button class="dropdown-item text-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">{% trans "Delete" %}</button>
-                        </div> 
+                        </div>
                       </div>
                     </td>
                   </tr>