diff --git a/apps/accounting_exports/migrations/0001_initial.py b/apps/accounting_exports/migrations/0001_initial.py index aa8951c1..ce709b25 100644 --- a/apps/accounting_exports/migrations/0001_initial.py +++ b/apps/accounting_exports/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.2 on 2023-10-27 06:47 +# Generated by Django 4.1.2 on 2023-10-27 09:30 import django.contrib.postgres.fields from django.db import migrations, models @@ -11,9 +11,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('workspaces', '0002_remove_exportsetting_auto_create_vendor_and_more'), + ('workspaces', '0002_sage300credential_importsetting_fylecredential_and_more'), + ('fyle_accounting_mappings', '0024_auto_20230922_0819'), ('fyle', '0001_initial'), - ('fyle_accounting_mappings', '0023_alter_mapping_destination'), ] operations = [ diff --git a/apps/fyle/migrations/0001_initial.py b/apps/fyle/migrations/0001_initial.py index 186ea7b2..b41dd5d6 100644 --- a/apps/fyle/migrations/0001_initial.py +++ b/apps/fyle/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.2 on 2023-10-27 06:47 +# Generated by Django 4.1.2 on 2023-10-27 09:30 import django.contrib.postgres.fields import django.core.validators @@ -12,7 +12,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('workspaces', '0002_remove_exportsetting_auto_create_vendor_and_more'), + ('workspaces', '0002_sage300credential_importsetting_fylecredential_and_more'), ] operations = [ diff --git a/apps/mappings/migrations/0001_initial.py b/apps/mappings/migrations/0001_initial.py index a39df98b..dd2c752a 100644 --- a/apps/mappings/migrations/0001_initial.py +++ b/apps/mappings/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.2 on 2023-10-27 06:47 +# Generated by Django 4.1.2 on 2023-10-27 09:30 from django.db import migrations, models import django.db.models.deletion @@ -10,7 +10,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('workspaces', '0002_remove_exportsetting_auto_create_vendor_and_more'), + ('workspaces', '0002_sage300credential_importsetting_fylecredential_and_more'), ] operations = [ diff --git a/apps/sage300/migrations/0001_initial.py b/apps/sage300/migrations/0001_initial.py index aac7628b..ab8a05c6 100644 --- a/apps/sage300/migrations/0001_initial.py +++ b/apps/sage300/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.2 on 2023-10-27 06:47 +# Generated by Django 4.1.2 on 2023-10-27 09:30 from django.db import migrations, models import django.db.models.deletion @@ -10,7 +10,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('workspaces', '0002_remove_exportsetting_auto_create_vendor_and_more'), + ('workspaces', '0002_sage300credential_importsetting_fylecredential_and_more'), ('accounting_exports', '0001_initial'), ] diff --git a/apps/workspaces/migrations/0001_initial.py b/apps/workspaces/migrations/0001_initial.py index 53200f2c..3f8f67b2 100644 --- a/apps/workspaces/migrations/0001_initial.py +++ b/apps/workspaces/migrations/0001_initial.py @@ -2,9 +2,7 @@ import apps.workspaces.models from django.conf import settings -import django.contrib.postgres.fields from django.db import migrations, models -import django.db.models.deletion import sage_desktop_api.models.fields @@ -37,95 +35,4 @@ class Migration(migrations.Migration): 'db_table': 'workspaces', }, ), - migrations.CreateModel( - name='Sage300Credential', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), - ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), - ('identifier', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 identifier', max_length=255)), - ('username', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 username', max_length=255)), - ('password', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 password', max_length=255)), - ('api_key', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 api key', max_length=255)), - ('api_secret', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 api secret', max_length=255)), - ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), - ], - options={ - 'db_table': 'sage300_credentials', - }, - ), - migrations.CreateModel( - name='ImportSetting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), - ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), - ('import_categories', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='toggle for import of chart of accounts from sage300')), - ('import_vendors_as_merchants', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='toggle for import of vendors as merchant from sage300')), - ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), - ], - options={ - 'db_table': 'import_settings', - }, - ), - migrations.CreateModel( - name='FyleCredential', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), - ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), - ('refresh_token', sage_desktop_api.models.fields.TextNotNullField(help_text='Fyle refresh token')), - ('cluster_domain', sage_desktop_api.models.fields.StringNullField(help_text='Fyle cluster domain', max_length=255, null=True)), - ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), - ], - options={ - 'db_table': 'fyle_credentials', - }, - ), - migrations.CreateModel( - name='ExportSetting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), - ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), - ('reimbursable_expenses_export_type', sage_desktop_api.models.fields.StringOptionsField(choices=[('PURCHASE_INVOICE', 'PURCHASE_INVOICE'), ('DIRECT_COST', 'DIRECT_COST')], default='', help_text='string field with options', max_length=255, null=True)), - ('default_bank_account_name', sage_desktop_api.models.fields.StringNullField(help_text='Bank account name', max_length=255, null=True)), - ('default_back_account_id', sage_desktop_api.models.fields.StringNullField(help_text='Bank Account ID', max_length=255, null=True)), - ('reimbursable_expense_state', sage_desktop_api.models.fields.StringOptionsField(choices=[('PAYMENT_PROCESSING', 'PAYMENT_PROCESSING'), ('CLOSED', 'CLOSED')], default='', help_text='string field with options', max_length=255, null=True)), - ('reimbursable_expense_date', sage_desktop_api.models.fields.StringOptionsField(choices=[('LAST_SPENT_AT', 'last_spent_at'), ('CREATED_AT', 'created_at'), ('SPENT_AT', 'spent_at')], default='', help_text='string field with options', max_length=255, null=True)), - ('reimbursable_expense_grouped_by', sage_desktop_api.models.fields.StringOptionsField(choices=[('REPORT', 'report_id'), ('EXPENSE', 'expense_id')], default='', help_text='string field with options', max_length=255, null=True)), - ('credit_card_expense_export_type', sage_desktop_api.models.fields.StringOptionsField(choices=[('JOURNAL_ENTRY', 'JOURNAL_ENTRY')], default='', help_text='string field with options', max_length=255, null=True)), - ('credit_card_expense_state', sage_desktop_api.models.fields.StringOptionsField(choices=[('APPROVED', 'APPROVED'), ('PAYMENT_PROCESSING', 'PAYMENT_PROCESSING'), ('PAID', 'PAID')], default='', help_text='string field with options', max_length=255, null=True)), - ('default_credit_card_account_name', sage_desktop_api.models.fields.StringNullField(help_text='Credit card account name', max_length=255, null=True)), - ('default_credit_card_account_id', sage_desktop_api.models.fields.StringNullField(help_text='Credit Card Account ID', max_length=255, null=True)), - ('credit_card_expense_grouped_by', sage_desktop_api.models.fields.StringOptionsField(choices=[('REPORT', 'report_id'), ('EXPENSE', 'expense_id')], default='', help_text='string field with options', max_length=255, null=True)), - ('credit_card_expense_date', sage_desktop_api.models.fields.StringOptionsField(choices=[('LAST_SPENT_AT', 'last_spent_at'), ('POSTED_AT', 'posted_at'), ('CREATED_AT', 'created_at')], default='', help_text='string field with options', max_length=255, null=True)), - ('default_vendor_name', sage_desktop_api.models.fields.StringNullField(help_text='default Vendor Name', max_length=255, null=True)), - ('default_vendor_id', sage_desktop_api.models.fields.StringNullField(help_text='default Vendor Id', max_length=255, null=True)), - ('auto_create_vendor', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='Auto create vendor')), - ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), - ], - options={ - 'db_table': 'export_settings', - }, - ), - migrations.CreateModel( - name='AdvancedSetting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), - ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), - ('expense_memo_structure', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=255), help_text='Array of fields in memo', null=True, size=None)), - ('schedule_is_enabled', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='Boolean to check if schedule is enabled')), - ('schedule_start_datetime', sage_desktop_api.models.fields.CustomDateTimeField(help_text='Schedule start date and time', null=True)), - ('schedule_id', sage_desktop_api.models.fields.StringNullField(help_text='Schedule id', max_length=255, null=True)), - ('interval_hours', sage_desktop_api.models.fields.IntegerNullField(help_text='Interval in hours', null=True)), - ('emails_selected', sage_desktop_api.models.fields.CustomJsonField(default=list, help_text='Emails Selected For Email Notification', null=True)), - ('emails_added', sage_desktop_api.models.fields.CustomJsonField(default=list, help_text='Emails Selected For Email Notification', null=True)), - ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), - ], - options={ - 'db_table': 'advanced_settings', - }, - ), ] diff --git a/apps/workspaces/migrations/0002_remove_exportsetting_auto_create_vendor_and_more.py b/apps/workspaces/migrations/0002_remove_exportsetting_auto_create_vendor_and_more.py deleted file mode 100644 index 18831e73..00000000 --- a/apps/workspaces/migrations/0002_remove_exportsetting_auto_create_vendor_and_more.py +++ /dev/null @@ -1,56 +0,0 @@ -# Generated by Django 4.1.2 on 2023-10-27 06:47 - -from django.db import migrations -import sage_desktop_api.models.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('workspaces', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='exportsetting', - name='auto_create_vendor', - ), - migrations.RemoveField( - model_name='exportsetting', - name='default_credit_card_account_id', - ), - migrations.RemoveField( - model_name='exportsetting', - name='default_credit_card_account_name', - ), - migrations.AddField( - model_name='advancedsetting', - name='auto_create_vendor', - field=sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='Auto create vendor'), - ), - migrations.AddField( - model_name='exportsetting', - name='auto_map_employees', - field=sage_desktop_api.models.fields.BooleanTrueField(default=True, help_text='Auto map employees'), - ), - migrations.AddField( - model_name='exportsetting', - name='default_ccc_credit_card_account_id', - field=sage_desktop_api.models.fields.StringNullField(help_text='CCC Credit Card Account ID', max_length=255, null=True), - ), - migrations.AddField( - model_name='exportsetting', - name='default_ccc_credit_card_account_name', - field=sage_desktop_api.models.fields.StringNullField(help_text='CCC Credit card account name', max_length=255, null=True), - ), - migrations.AddField( - model_name='exportsetting', - name='default_reimbursable_credit_card_account_id', - field=sage_desktop_api.models.fields.StringNullField(help_text='Reimbursable Credit card account name', max_length=255, null=True), - ), - migrations.AddField( - model_name='exportsetting', - name='default_reimbursable_credit_card_account_name', - field=sage_desktop_api.models.fields.StringNullField(help_text='Reimbursable Credit card account name', max_length=255, null=True), - ), - ] diff --git a/apps/workspaces/migrations/0002_sage300credential_importsetting_fylecredential_and_more.py b/apps/workspaces/migrations/0002_sage300credential_importsetting_fylecredential_and_more.py new file mode 100644 index 00000000..c075793b --- /dev/null +++ b/apps/workspaces/migrations/0002_sage300credential_importsetting_fylecredential_and_more.py @@ -0,0 +1,112 @@ +# Generated by Django 4.1.2 on 2023-10-27 09:30 + +import django.contrib.postgres.fields +from django.db import migrations, models +import django.db.models.deletion +import sage_desktop_api.models.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('workspaces', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Sage300Credential', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), + ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), + ('identifier', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 identifier', max_length=255)), + ('username', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 username', max_length=255)), + ('password', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 password', max_length=255)), + ('api_key', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 api key', max_length=255)), + ('api_secret', sage_desktop_api.models.fields.StringNotNullField(help_text='sage300 api secret', max_length=255)), + ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), + ], + options={ + 'db_table': 'sage300_credentials', + }, + ), + migrations.CreateModel( + name='ImportSetting', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), + ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), + ('import_categories', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='toggle for import of chart of accounts from sage300')), + ('import_vendors_as_merchants', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='toggle for import of vendors as merchant from sage300')), + ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), + ], + options={ + 'db_table': 'import_settings', + }, + ), + migrations.CreateModel( + name='FyleCredential', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), + ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), + ('refresh_token', sage_desktop_api.models.fields.TextNotNullField(help_text='Fyle refresh token')), + ('cluster_domain', sage_desktop_api.models.fields.StringNullField(help_text='Fyle cluster domain', max_length=255, null=True)), + ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), + ], + options={ + 'db_table': 'fyle_credentials', + }, + ), + migrations.CreateModel( + name='ExportSetting', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), + ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), + ('reimbursable_expenses_export_type', sage_desktop_api.models.fields.StringOptionsField(choices=[('PURCHASE_INVOICE', 'PURCHASE_INVOICE'), ('DIRECT_COST', 'DIRECT_COST')], default='', help_text='string field with options', max_length=255, null=True)), + ('default_bank_account_name', sage_desktop_api.models.fields.StringNullField(help_text='Bank account name', max_length=255, null=True)), + ('default_back_account_id', sage_desktop_api.models.fields.StringNullField(help_text='Bank Account ID', max_length=255, null=True)), + ('reimbursable_expense_state', sage_desktop_api.models.fields.StringOptionsField(choices=[('PAYMENT_PROCESSING', 'PAYMENT_PROCESSING'), ('CLOSED', 'CLOSED')], default='', help_text='string field with options', max_length=255, null=True)), + ('reimbursable_expense_date', sage_desktop_api.models.fields.StringOptionsField(choices=[('LAST_SPENT_AT', 'last_spent_at'), ('CREATED_AT', 'created_at'), ('SPENT_AT', 'spent_at')], default='', help_text='string field with options', max_length=255, null=True)), + ('reimbursable_expense_grouped_by', sage_desktop_api.models.fields.StringOptionsField(choices=[('REPORT', 'report_id'), ('EXPENSE', 'expense_id')], default='', help_text='string field with options', max_length=255, null=True)), + ('credit_card_expense_export_type', sage_desktop_api.models.fields.StringOptionsField(choices=[('JOURNAL_ENTRY', 'JOURNAL_ENTRY')], default='', help_text='string field with options', max_length=255, null=True)), + ('credit_card_expense_state', sage_desktop_api.models.fields.StringOptionsField(choices=[('APPROVED', 'APPROVED'), ('PAYMENT_PROCESSING', 'PAYMENT_PROCESSING'), ('PAID', 'PAID')], default='', help_text='string field with options', max_length=255, null=True)), + ('default_reimbursable_account_name', sage_desktop_api.models.fields.StringNullField(help_text='Reimbursable account name', max_length=255, null=True)), + ('default_reimbursable_account_id', sage_desktop_api.models.fields.StringNullField(help_text='Reimbursable Account ID', max_length=255, null=True)), + ('default_ccc_credit_card_account_name', sage_desktop_api.models.fields.StringNullField(help_text='CCC Credit card account name', max_length=255, null=True)), + ('default_ccc_credit_card_account_id', sage_desktop_api.models.fields.StringNullField(help_text='CCC Credit Card Account ID', max_length=255, null=True)), + ('default_reimbursable_credit_card_account_name', sage_desktop_api.models.fields.StringNullField(help_text='Reimbursable Credit card account name', max_length=255, null=True)), + ('default_reimbursable_credit_card_account_id', sage_desktop_api.models.fields.StringNullField(help_text='Reimbursable Credit card account name', max_length=255, null=True)), + ('credit_card_expense_grouped_by', sage_desktop_api.models.fields.StringOptionsField(choices=[('REPORT', 'report_id'), ('EXPENSE', 'expense_id')], default='', help_text='string field with options', max_length=255, null=True)), + ('credit_card_expense_date', sage_desktop_api.models.fields.StringOptionsField(choices=[('LAST_SPENT_AT', 'last_spent_at'), ('POSTED_AT', 'posted_at'), ('CREATED_AT', 'created_at')], default='', help_text='string field with options', max_length=255, null=True)), + ('default_vendor_name', sage_desktop_api.models.fields.StringNullField(help_text='default Vendor Name', max_length=255, null=True)), + ('default_vendor_id', sage_desktop_api.models.fields.StringNullField(help_text='default Vendor Id', max_length=255, null=True)), + ('auto_map_employees', sage_desktop_api.models.fields.BooleanTrueField(default=True, help_text='Auto map employees')), + ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), + ], + options={ + 'db_table': 'export_settings', + }, + ), + migrations.CreateModel( + name='AdvancedSetting', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True, help_text='Created at datetime')), + ('updated_at', models.DateTimeField(auto_now=True, help_text='Updated at datetime')), + ('expense_memo_structure', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=255), help_text='Array of fields in memo', null=True, size=None)), + ('schedule_is_enabled', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='Boolean to check if schedule is enabled')), + ('schedule_start_datetime', sage_desktop_api.models.fields.CustomDateTimeField(help_text='Schedule start date and time', null=True)), + ('schedule_id', sage_desktop_api.models.fields.StringNullField(help_text='Schedule id', max_length=255, null=True)), + ('interval_hours', sage_desktop_api.models.fields.IntegerNullField(help_text='Interval in hours', null=True)), + ('emails_selected', sage_desktop_api.models.fields.CustomJsonField(default=list, help_text='Emails Selected For Email Notification', null=True)), + ('emails_added', sage_desktop_api.models.fields.CustomJsonField(default=list, help_text='Emails Selected For Email Notification', null=True)), + ('auto_create_vendor', sage_desktop_api.models.fields.BooleanFalseField(default=True, help_text='Auto create vendor')), + ('workspace', models.OneToOneField(help_text='Reference to Workspace model', on_delete=django.db.models.deletion.PROTECT, to='workspaces.workspace')), + ], + options={ + 'db_table': 'advanced_settings', + }, + ), + ] diff --git a/apps/workspaces/models.py b/apps/workspaces/models.py index 264ff656..13771f6e 100644 --- a/apps/workspaces/models.py +++ b/apps/workspaces/models.py @@ -170,6 +170,8 @@ class ExportSetting(BaseModel): credit_card_expense_state = StringOptionsField( choices=CREDIT_CARD_EXPENSE_STATE_CHOICES ) + default_reimbursable_account_name = StringNullField(help_text='Reimbursable account name') + default_reimbursable_account_id = StringNullField(help_text='Reimbursable Account ID') default_ccc_credit_card_account_name = StringNullField(help_text='CCC Credit card account name') default_ccc_credit_card_account_id = StringNullField(help_text='CCC Credit Card Account ID') default_reimbursable_credit_card_account_name = StringNullField(help_text='Reimbursable Credit card account name') diff --git a/requirements.txt b/requirements.txt index 5bad3d74..e71c44d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ cryptography==38.0.3 # Django and Django REST Framework Django==4.1.2 -django-cors-headers==3.2.0 +django-cors-headers==4.3.0 django-rest-framework==0.1.0 djangorestframework==3.14.0 django-db-geventpool==4.0.1 @@ -24,12 +24,12 @@ gevent==23.9.1 gunicorn==20.1.0 # Platform SDK -fyle==0.34.0 +fyle==0.35.0 # Reusable Fyle Packages -fyle-rest-auth==1.4.0 -fyle-accounting-mappings==1.26.0 -fyle-integrations-platform-connector==1.35.3 +fyle-rest-auth==1.5.0 +fyle-accounting-mappings==1.27.3 +fyle-integrations-platform-connector==1.36.1 # Postgres Dependincies psycopg2-binary==2.9.9 diff --git a/tests/test_workspaces/test_views.py b/tests/test_workspaces/test_views.py index bbc4eb00..c3691153 100644 --- a/tests/test_workspaces/test_views.py +++ b/tests/test_workspaces/test_views.py @@ -132,6 +132,8 @@ def test_export_settings(api_client, test_connection): 'credit_card_expense_state': 'PAID', 'credit_card_expense_grouped_by': 'EXPENSE', 'credit_card_expense_date': 'CREATED_AT', + 'default_reimbursable_account_name': 'reimbursable account', + 'default_reimbursable_account_id': '123', 'default_ccc_credit_card_account_name': 'CCC credit card account', 'default_ccc_credit_card_account_id': '123', 'default_reimbursable_credit_card_account_name': 'reimbursable credit card account', @@ -155,6 +157,8 @@ def test_export_settings(api_client, test_connection): assert export_settings.credit_card_expense_state == 'PAID' assert export_settings.credit_card_expense_grouped_by == 'EXPENSE' assert export_settings.credit_card_expense_date == 'CREATED_AT' + assert export_settings.default_reimbursable_account_name == 'reimbursable account' + assert export_settings.default_reimbursable_account_id == '123' assert export_settings.default_ccc_credit_card_account_name == 'CCC credit card account' assert export_settings.default_ccc_credit_card_account_id == '123' assert export_settings.default_reimbursable_credit_card_account_name == 'reimbursable credit card account' @@ -173,6 +177,8 @@ def test_export_settings(api_client, test_connection): assert export_settings.credit_card_expense_state == 'PAID' assert export_settings.credit_card_expense_grouped_by == 'EXPENSE' assert export_settings.credit_card_expense_date == 'CREATED_AT' + assert export_settings.default_reimbursable_account_name == 'reimbursable account' + assert export_settings.default_reimbursable_account_id == '123' assert export_settings.default_ccc_credit_card_account_name == 'CCC credit card account' assert export_settings.default_ccc_credit_card_account_id == '123' assert export_settings.default_reimbursable_credit_card_account_name == 'reimbursable credit card account'