diff --git a/inventory/models.py b/inventory/models.py index 9e8066a4..34dee64d 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -2131,7 +2131,7 @@ class CustomGroup(models.Model): other_perms=['view_car','view_carlocation','view_customcard','view_carcolors','view_cartransfer']) elif self.name == "Accountant": self.set_permissions(app="inventory",allowed_models=["carfinance"],other_perms=['view_car','view_carlocation','view_customcard','view_carcolors','view_cartransfer','view_saleorder']) - self.set_permissions(app="django_ledger",allowed_models=["bankaccountmodel","accountmodel","chartofaccountmodel","customcard","billmodel","itemmodel","invoicemodel","vendormodel"],other_perms=['view_customermodel','view_estimatemodel']) + self.set_permissions(app="django_ledger",allowed_models=["bankaccountmodel","accountmodel","chartofaccountmodel","customcard","billmodel","itemmodel","invoicemodel","vendormodel","journalentrymodel"],other_perms=['view_customermodel','view_estimatemodel']) elif self.name == "Agent": # Todo : set permissions for agent pass diff --git a/inventory/utils.py b/inventory/utils.py index 17eb2aa2..e966838e 100644 --- a/inventory/utils.py +++ b/inventory/utils.py @@ -1196,7 +1196,7 @@ def handle_account_process(invoice,amount,finance_data): description=f"Payment for Invoice {invoice.invoice_number}", ledger=invoice.ledger, locked=False, - origin=f"Sale of {car.name}{car.vin}: Invoice {invoice.invoice_number}", + origin=f"Sale of {car.id_car_make.name}{car.vin}: Invoice {invoice.invoice_number}", ) TransactionModel.objects.create( @@ -1217,7 +1217,7 @@ def handle_account_process(invoice,amount,finance_data): journal_cogs = JournalEntryModel.objects.create( posted=False, - description=f"COGS of {car.name}{car.vin}: Invoice {invoice.invoice_number}", + description=f"COGS of {car.id_car_make.name}{car.vin}: Invoice {invoice.invoice_number}", ledger=invoice.ledger, locked=False, origin="Payment", @@ -1237,8 +1237,10 @@ def handle_account_process(invoice,amount,finance_data): tx_type="credit", description="", ) - - car.item_model.for_inventory = False + try: + car.item_model.for_inventory = False + except Exception as e: + print(e) car.finances.is_sold = True car.finances.save() car.item_model.save()