Merge branch 'master' into disable-items-category

.github/pr_checks_config.yml

@@ -0,0 +1,10 @@
+pr_checks:
+  title:
+    - name: 'prefix_check'
+      regex: '^(?i)(fix|feat|test|chore|refactor|build):'
+      message_if_not_matching: 'PR title must start with "fix:", "feat:", "chore:", "refactor", or "test:" (case-insensitive)'
+
+  description:
+    - name: 'clickup_check'
+      regex: '(?i)app.clickup.com'
+      message_if_not_matching: 'PR description must contain a link to a ClickUp (case-insensitive)'

.github/workflows/pr_checks.yml

@@ -0,0 +1,19 @@
+name: Strong PR Checks
+
+on:
+  pull_request:
+    types: [opened, synchronize, edited]
+
+permissions: 
+  pull-requests: write
+  contents: read
+
+jobs:
+  pr_checks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run strong checks
+        uses: fylein/fyle-pr-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          config-file: .github/pr_checks_config.yml

apps/quickbooks_online/utils.py

@@ -186,8 +186,11 @@ def sync_accounts(self):
         accounts_generator = self.connection.accounts.get_all_generator()
         category_sync_version = 'v2'
         general_settings = WorkspaceGeneralSettings.objects.filter(workspace_id=self.workspace_id).first()
+        is_category_import_to_fyle_enabled = False
+
         if general_settings:
             category_sync_version = general_settings.category_sync_version
+            is_category_import_to_fyle_enabled = general_settings.import_categories
 
         for accounts in accounts_generator:
             account_attributes = {'account': [], 'credit_card_account': [], 'bank_account': [], 'accounts_payable': []}
@@ -254,7 +257,8 @@ def sync_accounts(self):
                         self.workspace_id,
                         True,
                         attribute_type.title().replace('_', ' '),
-                        attribute_disable_callback_path=ATTRIBUTE_CALLBACK_PATH.get(attribute_type.upper())
+                        attribute_disable_callback_path=ATTRIBUTE_CALLBACK_PATH.get(attribute_type.upper()),
+                        is_import_to_fyle_enabled=is_category_import_to_fyle_enabled
                     )
 
         last_synced_time = get_last_synced_time(self.workspace_id, 'CATEGORY')

requirements.txt

@@ -21,8 +21,8 @@ django-sendgrid-v5==1.2.0
 enum34==1.1.10
 future==0.18.2
 fyle==0.37.0
-fyle-accounting-mappings==1.34.2
-fyle-integrations-platform-connector==1.38.4
+fyle-accounting-mappings==1.34.4
+fyle-integrations-platform-connector==1.39.1
 fyle-rest-auth==1.7.2
 flake8==4.0.1
 gevent==23.9.1

tests/test_fyle_integrations_imports/test_modules/test_categories.py

@@ -504,7 +504,7 @@ def test_disable_categories(
     mock_platform = mocker.patch('fyle_integrations_imports.modules.categories.PlatformConnector')
     bulk_post_call = mocker.patch.object(mock_platform.return_value.categories, 'post_bulk')
 
-    disable_categories(workspace_id, categories_to_disable)
+    disable_categories(workspace_id, categories_to_disable, is_import_to_fyle_enabled=True)
 
     assert bulk_post_call.call_count == 1
 
@@ -517,7 +517,7 @@ def test_disable_categories(
         }
     }
 
-    disable_categories(workspace_id, categories_to_disable)
+    disable_categories(workspace_id, categories_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_post_call.call_count == 1
 
     # Test disable category with code in naming
@@ -550,7 +550,7 @@ def test_disable_categories(
         'id': 'source_id_123'
     }]
 
-    bulk_payload = disable_categories(workspace_id, categories_to_disable)
+    bulk_payload = disable_categories(workspace_id, categories_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_payload == payload