diff --git a/apps/business_central/exports/journal_entry/models.py b/apps/business_central/exports/journal_entry/models.py index f23cfab..baee370 100644 --- a/apps/business_central/exports/journal_entry/models.py +++ b/apps/business_central/exports/journal_entry/models.py @@ -42,9 +42,11 @@ def create_or_update_object(self, accounting_export: AccountingExport, _: Advanc :return: purchase invoices object """ expense = accounting_export.expenses.first() - accounts_payable_account_id = export_settings.default_bank_account_id + if expense.fund_source == 'CCC': + accounts_payable_account_id = export_settings.default_CCC_bank_account_id + advance_setting = AdvancedSetting.objects.get(workspace_id=accounting_export.workspace_id) document_number = expense.expense_number diff --git a/apps/workspaces/migrations/0005_exportsetting_default_ccc_bank_account_id_and_more.py b/apps/workspaces/migrations/0005_exportsetting_default_ccc_bank_account_id_and_more.py new file mode 100644 index 0000000..73938c2 --- /dev/null +++ b/apps/workspaces/migrations/0005_exportsetting_default_ccc_bank_account_id_and_more.py @@ -0,0 +1,24 @@ +# Generated by Django 4.1.2 on 2024-12-11 10:37 + +from django.db import migrations +import ms_business_central_api.models.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('workspaces', '0004_importsetting_charts_of_accounts'), + ] + + operations = [ + migrations.AddField( + model_name='exportsetting', + name='default_CCC_bank_account_id', + field=ms_business_central_api.models.fields.StringNullField(help_text='CCC Bank Account ID', max_length=255, null=True), + ), + migrations.AddField( + model_name='exportsetting', + name='default_CCC_bank_account_name', + field=ms_business_central_api.models.fields.StringNullField(help_text='CCC Bank account name', max_length=255, null=True), + ), + ] diff --git a/apps/workspaces/models.py b/apps/workspaces/models.py index e1a78c3..8e773b9 100644 --- a/apps/workspaces/models.py +++ b/apps/workspaces/models.py @@ -186,6 +186,8 @@ class ExportSetting(BaseModel): ) default_bank_account_name = StringNullField(help_text='Bank account name') default_bank_account_id = StringNullField(help_text='Bank Account ID') + default_CCC_bank_account_name = StringNullField(help_text='CCC Bank account name') + default_CCC_bank_account_id = StringNullField(help_text='CCC Bank Account ID') reimbursable_expense_state = StringOptionsField( choices=REIMBURSABLE_EXPENSE_STATE_CHOICES )