fix: correct categorisation of is_export and fetching taxes accordingly

(cherry picked from commit ae4792e) # Conflicts: # .git-blame-ignore-revs # .github/helper/install.sh # .github/workflows/on_release.yml # .github/workflows/semantic-commits.yml # .github/workflows/server-tests.yml # .mergify.yml # .releaserc # README.md # india_compliance/__init__.py # india_compliance/audit_trail/overrides/test_account_settings.py # india_compliance/audit_trail/overrides/test_customize_form.py # india_compliance/audit_trail/overrides/test_property_setter.py # india_compliance/audit_trail/overrides/test_version.py # india_compliance/boot.py # india_compliance/exceptions.py # india_compliance/gst_india/api_classes/base.py # india_compliance/gst_india/api_classes/taxpayer_base.py # india_compliance/gst_india/api_classes/taxpayer_e_invoice.py # india_compliance/gst_india/api_classes/taxpayer_returns.py # india_compliance/gst_india/client_scripts/company.js # india_compliance/gst_india/client_scripts/customer.js # india_compliance/gst_india/client_scripts/e_invoice_actions.js # india_compliance/gst_india/client_scripts/e_waybill_actions.js # india_compliance/gst_india/client_scripts/e_waybill_applicability.js # india_compliance/gst_india/client_scripts/party.js # india_compliance/gst_india/client_scripts/purchase_invoice.js # india_compliance/gst_india/client_scripts/sales_invoice.js # india_compliance/gst_india/client_scripts/supplier.js # india_compliance/gst_india/constants/__init__.py # india_compliance/gst_india/constants/custom_fields.py # india_compliance/gst_india/constants/e_waybill.py # india_compliance/gst_india/data/test_e_waybill.json # india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.js # india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.json # india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py # india_compliance/gst_india/doctype/bill_of_entry/test_bill_of_entry.py # india_compliance/gst_india/doctype/bill_of_entry_item/bill_of_entry_item.json # india_compliance/gst_india/doctype/e_invoice_applicable_company/e_invoice_applicable_company.json # india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.js # india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json # india_compliance/gst_india/doctype/e_invoice_log/test_e_invoice_log.py # india_compliance/gst_india/doctype/e_waybill_log/e_waybill_log.js # india_compliance/gst_india/doctype/e_waybill_log/e_waybill_log.json # india_compliance/gst_india/doctype/e_waybill_log/test_e_waybill_log.py # india_compliance/gst_india/doctype/gst_account/gst_account.json # india_compliance/gst_india/doctype/gst_credential/gst_credential.json # india_compliance/gst_india/doctype/gst_hsn_code/gst_hsn_code.json # india_compliance/gst_india/doctype/gst_hsn_code/test_gst_hsn_code.py # india_compliance/gst_india/doctype/gst_inward_supply/gst_inward_supply.json # india_compliance/gst_india/doctype/gst_inward_supply/test_gst_inward_supply.py # india_compliance/gst_india/doctype/gst_inward_supply_item/gst_inward_supply_item.json # india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py # india_compliance/gst_india/doctype/gst_return_log/gst_return_log.js # india_compliance/gst_india/doctype/gst_return_log/gst_return_log.json # india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py # india_compliance/gst_india/doctype/gst_return_log/test_gst_return_log.py # india_compliance/gst_india/doctype/gst_settings/gst_settings.json # india_compliance/gst_india/doctype/gst_settings/gst_settings.py # india_compliance/gst_india/doctype/gst_settings/test_gst_settings.py # india_compliance/gst_india/doctype/gst_uom_map/gst_uom_map.json # india_compliance/gst_india/doctype/gstin/gstin.json # india_compliance/gst_india/doctype/gstin/test_gstin.py # india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.css # india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js # india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py # india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_export.py # india_compliance/gst_india/doctype/gstr_1_beta/test_gstr_1_beta.py # india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.js # india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.json # india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py # india_compliance/gst_india/doctype/gstr_3b_report/test_gstr_3b_report.py # india_compliance/gst_india/doctype/gstr_import_log/gstr_import_log.json # india_compliance/gst_india/doctype/gstr_import_log/test_gstr_import_log.py # india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py # india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.css # india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.js # india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.json # india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.py # india_compliance/gst_india/doctype/purchase_reconciliation_tool/test_purchase_reconciliation_tool.py # india_compliance/gst_india/overrides/company.py # india_compliance/gst_india/overrides/ineligible_itc.py # india_compliance/gst_india/overrides/item.py # india_compliance/gst_india/overrides/payment_entry.py # india_compliance/gst_india/overrides/purchase_invoice.py # india_compliance/gst_india/overrides/purchase_receipt.py # india_compliance/gst_india/overrides/sales_invoice.py # india_compliance/gst_india/overrides/test_advance_payment_entry.py # india_compliance/gst_india/overrides/test_company.py # india_compliance/gst_india/overrides/test_ineligible_itc.py # india_compliance/gst_india/overrides/test_item_tax_template.py # india_compliance/gst_india/overrides/test_party.py # india_compliance/gst_india/overrides/test_purchase_invoice.py # india_compliance/gst_india/overrides/test_sales_invoice.py # india_compliance/gst_india/overrides/test_transaction.py # india_compliance/gst_india/overrides/test_transaction_data.py # india_compliance/gst_india/overrides/transaction.py # india_compliance/gst_india/page/india_compliance_account/india_compliance_account.js # india_compliance/gst_india/print_format/e_invoice/e_invoice.html # india_compliance/gst_india/print_format/gst_tax_invoice/gst_tax_invoice.json # india_compliance/gst_india/report/gst_sales_register_beta/test_sales_register_beta.py # india_compliance/gst_india/report/gstr_1/gstr_1.py # india_compliance/gst_india/report/gstr_1/test_gstr_1.py # india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.js # india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py # india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py # india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/test_hsn_wise_summary_of_outward_supplies.py # india_compliance/gst_india/setup/__init__.py # india_compliance/gst_india/setup/property_setters.py # india_compliance/gst_india/uninstall.py # india_compliance/gst_india/utils/__init__.py # india_compliance/gst_india/utils/e_invoice.py # india_compliance/gst_india/utils/e_waybill.py # india_compliance/gst_india/utils/gstin_info.py # india_compliance/gst_india/utils/gstr_1/__init__.py # india_compliance/gst_india/utils/gstr_1/gstr_1_download.py # india_compliance/gst_india/utils/gstr_1/gstr_1_json_map.py # india_compliance/gst_india/utils/gstr_1/test_gstr_1_json_map.py # india_compliance/gst_india/utils/gstr_2/__init__.py # india_compliance/gst_india/utils/gstr_2/test_gstr_2a.py # india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v3_0.py # india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v4_0.py # india_compliance/gst_india/utils/gstr_utils.py # india_compliance/gst_india/utils/test_e_invoice.py # india_compliance/gst_india/utils/test_e_waybill.py # india_compliance/gst_india/utils/test_gstin_info.py # india_compliance/gst_india/utils/test_utils.py # india_compliance/gst_india/utils/tests.py # india_compliance/gst_india/utils/transaction_data.py # india_compliance/gst_india/workspace/gst_india/gst_india.json # india_compliance/hooks.py # india_compliance/income_tax_india/constants/__init__.py # india_compliance/income_tax_india/constants/custom_fields.py # india_compliance/income_tax_india/data/tds_details.json # india_compliance/income_tax_india/overrides/tax_withholding_category.py # india_compliance/install.py # india_compliance/patches.txt # india_compliance/patches/post_install/set_gst_tax_type.py # india_compliance/patches/post_install/update_e_invoice_fields_and_logs.py # india_compliance/patches/v14/update_item_gst_details_and_gst_trearment_in_bill_of_entry.py # india_compliance/public/js/components/view_group.js # india_compliance/public/js/india_compliance.bundle.js # india_compliance/public/js/india_compliance_account/IndiaComplianceAccountApp.vue # india_compliance/public/js/india_compliance_account/components/FormField.vue # india_compliance/public/js/india_compliance_account/components/PageTitle.vue # india_compliance/public/js/india_compliance_account/india_compliance_account.bundle.js # india_compliance/public/js/india_compliance_account/pages/AccountPage.vue # india_compliance/public/js/india_compliance_account/pages/AuthPage.vue # india_compliance/public/js/india_compliance_account/pages/MailSentPage.vue # india_compliance/public/js/india_compliance_account/pages/PaymentPage.vue # india_compliance/public/js/india_compliance_account/pages/PurchaseCreditsPage.vue # india_compliance/public/js/india_compliance_account/router.js # india_compliance/public/js/india_compliance_account/store/index.js # india_compliance/public/js/india_compliance_account/store/modules/account.js # india_compliance/public/js/india_compliance_account/store/modules/auth.js # india_compliance/public/js/regex_constants.js # india_compliance/public/js/transaction.js # india_compliance/public/js/utils.js # india_compliance/public/scss/india_compliance_account.bundle.scss # india_compliance/setup_wizard.py # india_compliance/test_patches.py # india_compliance/tests/__init__.py # india_compliance/tests/test_records.json # india_compliance/uninstall.py # india_compliance/vat_india/doctype/c_form/c_form.json # india_compliance/vat_india/doctype/c_form_invoice_detail/c_form_invoice_detail.json # pyproject.toml
resilient-tech · Dec 12, 2024 · c45ecd4 · c45ecd4
1 parent 6d8f0e1
commit c45ecd4
Show file tree

Hide file tree

Showing 219 changed files with 11,355 additions and 2 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -18,7 +18,10 @@
 dec2438be2d63eff24da45d6c936ec846d8ab0df
 
 # refactor window.ic => window.india_compliance
+<<<<<<< HEAD
 0907e8a6105c42293e7c7a2eb51024f9f6040baf
+=======
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 38a53480c70a2c820049f023cbabbdaa3ea8aad6
 
 # updated black in pre-commit

diff --git a/.github/ISSUE_TEMPLATE/PULL_REQUEST_TEMPLATE.md b/.github/ISSUE_TEMPLATE/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,33 @@
+<!--
+
+Some key notes before you open a PR:
+
+ 1. Select which branch should this PR be merged in?
+ 2. PR name follows [convention](https://github.com/resilient-tech/india-compliance/blob/develop/commitlint.config.js)
+ 3. All tests pass locally, UI and Unit tests
+ 4. All business logic and validations must be on the server-side
+ 5. Update necessary Documentation
+ 6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes
+
+
+Also, if you're new here
+
+- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Page-format-for-ERPNext-docs
+
+- Contribution Guide => https://github.com/frappe/erpnext/blob/develop/.github/CONTRIBUTING.md
+
+- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
+
+-->
+
+> Please provide enough information so that others can review your pull request:
+
+<!-- You can skip this if you're fixing a typo or updating existing documentation -->
+
+> Explain the **details** for making this change. What existing problem does the pull request solve?
+
+<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->
+
+> Screenshots/GIFs
+
+<!-- Add images/recordings to better visualize the change: expected/current behviour -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,58 @@
+---
+name: Bug Report
+description: Report a bug encountered while using India Compliance
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome to India Compliance issue tracker! Prior to submitting a request, kindly consider the following:
+
+        1. This tracker should only be used to report bugs and request features / enhancements to India Compliance
+            - For questions and general support, checkout the [documentation](https://docs.erpnext.com/docs/v14/user/manual/en/regional/india).
+            - For documentation issues, propose edit on documentation site directly.
+        2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+           the original discussion.
+        3. When making a bug report, make sure you provide all required information. The easier it is for
+           maintainers to reproduce, the faster it'll be fixed.
+        4. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
+
+  - type: textarea
+    id: bug-info
+    attributes:
+      label: Information about bug
+      description: Also tell us, what did you expect to happen?
+                   If applicable, add screenshots to help explain your problem.
+      placeholder: Please provide as much information as possible.
+    validations:
+      required: true
+
+  - type: textarea
+    id: exact-version
+    attributes:
+      label: Version
+      description: Share exact version number of Frappe, ERPNext and India Compliance you are using.
+      placeholder: |
+        Frappe Version -
+        ERPNext Verion -
+        India Compliance Version -
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output / Stack trace / Full Error Message.
+      description: Please copy and paste any relevant log output. This will be automatically formatted.
+      render: shell
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/resilient-tech/india-compliance/blob/develop/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,45 @@
+---
+name: Feature Request
+description: Suggest an idea to improve India Compliance
+labels: ["feature-request"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome to India Compliance issue tracker! Prior to submitting a request, kindly consider the following:
+
+        1. This tracker should only be used to report bugs and request features / enhancements to India Compliance
+            - For questions and general support, checkout the [documentation](https://docs.erpnext.com/docs/v14/user/manual/en/regional/india)
+        2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+          the original discussion.
+        3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
+
+
+        Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature.
+
+  - type: textarea
+    id: problem-info
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is.
+      placeholder: Please provide as much information as possible.
+
+  - type: textarea
+    id: solution-info
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+
+  - type: textarea
+    id: alternatives-info
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+...
diff --git a/.github/helper/install.sh b/.github/helper/install.sh
@@ -40,15 +40,22 @@ mkdir ~/frappe-bench/sites/test_site
 cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/test_site/
 
 
+<<<<<<< HEAD
 mysql --host 127.0.0.1 --port 3306 -u root -e "
+=======
+mariadb --host 127.0.0.1 --port 3306 -u root -ptravis -e "
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 SET GLOBAL character_set_server = 'utf8mb4';
 SET GLOBAL collation_server = 'utf8mb4_unicode_ci';
 
 CREATE USER 'test_resilient'@'localhost' IDENTIFIED BY 'test_resilient';
 CREATE DATABASE test_resilient;
 GRANT ALL PRIVILEGES ON \`test_resilient\`.* TO 'test_resilient'@'localhost';
 
+<<<<<<< HEAD
 UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root';
+=======
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 FLUSH PRIVILEGES;
 "
 

diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml
@@ -0,0 +1,30 @@
+
+# This workflow is agnostic to branches. Only maintain on develop branch.
+# To add/remove versions just modify the matrix.
+
+name: Initiate Release
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version: ["14", "15"]
+
+    steps:
+      - uses: octokit/[email protected]
+        with:
+          route: POST /repos/{owner}/{repo}/pulls
+          owner: resilient-tech
+          repo: india-compliance
+          title: |-
+            "chore: release v${{ matrix.version }}"
+          body: "Automated Release."
+          base: version-${{ matrix.version }}
+          head: version-${{ matrix.version }}-hotfix
+        env:
+          GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
@@ -5,6 +5,10 @@ on:
   push:
     branches:
       - version-14
+<<<<<<< HEAD
+=======
+      - version-15
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 jobs:
   release:
     name: Release
@@ -17,7 +21,11 @@ jobs:
           persist-credentials: false
 
       - name: Setup Node.js
+<<<<<<< HEAD
         uses: actions/setup-node@v2
+=======
+        uses: actions/setup-node@v4
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
         with:
           node-version: 20
 

diff --git a/.github/workflows/semantic-commits.yml b/.github/workflows/semantic-commits.yml
@@ -19,7 +19,11 @@ jobs:
               with:
                   fetch-depth: 200
 
+<<<<<<< HEAD
             - uses: actions/setup-node@v3
+=======
+            - uses: actions/setup-node@v4
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
               with:
                   node-version: 20
                   check-latest: true

diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
@@ -21,7 +21,11 @@ on:
             - "**.csv"
 
     push:
+<<<<<<< HEAD
         branches: [next, version-14-hotfix, version-14]
+=======
+        branches: [develop, version-14-hotfix, version-14, version-15-hotfix, version-15]
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
         paths-ignore:
             - "**.css"
             - "**.js"
@@ -43,13 +47,23 @@ jobs:
         name: Python Unit Tests
 
         services:
+<<<<<<< HEAD
             mysql:
                 image: mariadb:10.3
                 env:
                     MYSQL_ALLOW_EMPTY_PASSWORD: YES
                 ports:
                     - 3306:3306
                 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+=======
+            mariadb:
+                image: mariadb:10.6
+                env:
+                    MARIADB_ROOT_PASSWORD: 'travis'
+                ports:
+                    - 3306:3306
+                options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 
         steps:
             - name: Clone
@@ -58,10 +72,17 @@ jobs:
             - name: Setup Python
               uses: actions/setup-python@v5
               with:
+<<<<<<< HEAD
                   python-version: "3.10"
 
             - name: Setup Node
               uses: actions/setup-node@v3
+=======
+                  python-version: "3.11"
+
+            - name: Setup Node
+              uses: actions/setup-node@v4
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
               with:
                   node-version: 20
                   check-latest: true

diff --git a/.mergify.yml b/.mergify.yml
@@ -6,12 +6,23 @@ pull_request_rules:
           - author!=vorasmit
           - author!=mergify[bot]
           - author!=dependabot[bot]
+<<<<<<< HEAD
           - base=version-14
+=======
+          - author!=india-compliance-bot
+      - or:
+          - base=version-14
+          - base=version-15
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
     actions:
       close:
       comment:
           message: |
+<<<<<<< HEAD
             @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on the `next` branch.
+=======
+            @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on the `develop` branch.
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 
   - name: Automatic merge on CI success and review
     conditions:
@@ -21,7 +32,11 @@ pull_request_rules:
     actions:
       merge:
         method: merge
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
   - name: Automatic squash on CI success and review
     conditions:
       - label!=dont-merge
@@ -33,6 +48,7 @@ pull_request_rules:
         commit_message_template: |
             {{ title }} (#{{ number }})
             {{ body }}
+<<<<<<< HEAD
 
   - name: backport to develop
     conditions:
@@ -44,6 +60,19 @@ pull_request_rules:
         assignees:
           - "{{ author }}"
 
+=======
+
+  - name: backport to develop
+    conditions:
+      - label="backport develop"
+    actions:
+      backport:
+        branches:
+          - develop
+        assignees:
+          - "{{ author }}"
+
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
   - name: backport to version-14-hotfix
     conditions:
       - label="backport version-14-hotfix"
@@ -54,6 +83,19 @@ pull_request_rules:
         assignees:
           - "{{ author }}"
 
+<<<<<<< HEAD
+=======
+  - name: backport to version-15-hotfix
+    conditions:
+      - label="backport version-15-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-15-hotfix
+        assignees:
+          - "{{ author }}"
+
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
   - name: automatically merge backport if they pass tests
     conditions:
       - author=mergify[bot]

diff --git a/.releaserc b/.releaserc
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
 	"branches": ["version-14"],
+=======
+	"branches": ["version-14", "version-15"],
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -21,4 +25,8 @@
 		],
 		"@semantic-release/github"
 	]
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> ae4792e4 (fix: correct categorisation of is_export and fetching taxes accordingly)