From 3ba62dbe587ee54c172e90eafba752bf134f00e4 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Tue, 21 Jan 2025 15:09:25 +0530 Subject: [PATCH] fix: merge conflicts in check run json --- .pre-commit-config.yaml | 52 +- .../doctype/check_run/check_run.json | 23 +- .../check_run_settings.json | 511 ++++-------------- 3 files changed, 149 insertions(+), 437 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 88213762..0e97e47d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,10 +1,10 @@ exclude: 'node_modules|.git' -default_stages: [commit] +default_stages: [pre-commit] fail_fast: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v5.0.0 hooks: - id: trailing-whitespace files: 'check_run.*' @@ -20,58 +20,56 @@ repos: - id: debug-statements - repo: https://github.com/asottile/pyupgrade - rev: v2.34.0 + rev: v3.19.1 hooks: - id: pyupgrade args: ['--py310-plus'] - - repo: https://github.com/frappe/black + - repo: https://github.com/agritheory/black rev: 951ccf4d5bb0d692b457a5ebc4215d755618eb68 hooks: - id: black - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.7.1 + - repo: https://github.com/PyCQA/autoflake + rev: v2.3.1 hooks: - - id: prettier - types_or: [javascript] - # Ignore any files that might contain jinja / bundles - exclude: | - (?x)^( - check_run/public/dist/.*| - .*node_modules.*| - .*boilerplate.*| - check_run/www/website_script.js| - check_run/templates/includes/.*| - check_run/public/js/lib/.* - )$ + - id: autoflake + args: [--remove-all-unused-imports, --in-place] - repo: https://github.com/PyCQA/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 7.1.1 hooks: - id: flake8 additional_dependencies: ['flake8-bugbear'] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.5.1 + rev: v1.14.1 hooks: - id: mypy exclude: ^tests/ args: [--ignore-missing-imports] - - repo: local + - repo: https://github.com/agritheory/test_utils + rev: v0.17.0 hooks: + - id: update_pre_commit_config + - id: validate_copyright + files: '\.(js|ts|py|md)$' + args: ['--app', 'check_run'] - id: validate_customizations - always_run: true - name: .github/validate_customizations.py - entry: python .github/validate_customizations.py - language: system - types: [python] + # - id: validate_python_dependencies + + - repo: local + hooks: + - id: prettier + name: prettier + entry: npx prettier . --write --ignore-path .prettierignore + language: node ci: autoupdate_schedule: weekly diff --git a/check_run/check_run/doctype/check_run/check_run.json b/check_run/check_run/doctype/check_run/check_run.json index 512f526c..30e984a9 100644 --- a/check_run/check_run/doctype/check_run/check_run.json +++ b/check_run/check_run/doctype/check_run/check_run.json @@ -27,8 +27,7 @@ "print_count", "status", "ach_file_generated", - "sepa_file_generated" - + "sepa_file_generated" ], "fields": [ { @@ -167,16 +166,14 @@ "fieldtype": "Check", "hidden": 1, "label": "Ach File Generated" - - }, - { - "allow_on_submit": 1, - "default": "0", - "fieldname": "sepa_file_generated", - "fieldtype": "Check", - "hidden": 1 - } - + }, + { + "allow_on_submit": 1, + "default": "0", + "fieldname": "sepa_file_generated", + "fieldtype": "Check", + "hidden": 1 + } ], "is_submittable": 1, "links": [], @@ -215,4 +212,4 @@ "track_changes": 1, "track_seen": 1, "track_views": 1 -} \ No newline at end of file +} diff --git a/check_run/check_run/doctype/check_run_settings/check_run_settings.json b/check_run/check_run/doctype/check_run_settings/check_run_settings.json index cf1eaf35..ee404efa 100644 --- a/check_run/check_run/doctype/check_run_settings/check_run_settings.json +++ b/check_run/check_run/doctype/check_run_settings/check_run_settings.json @@ -1,317 +1,4 @@ { - "actions": [], - "autoname": "format:ACC-CRS-{bank_account}-{pay_to_account}", - "creation": "2022-08-22 14:43:43.533105", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "company", - "bank_account", - "column_break_3", - "pay_to_account", - "print_format", - "section_break_4", - "include_purchase_invoices", - "include_journal_entries", - "include_expense_claims", - "pre_check_overdue_items", - "allow_cancellation", - "cascade_cancellation", - "validate_unique_check_number", - "column_break_9", - "number_of_invoices_per_voucher", - "split_by_address", - "automatically_release_on_hold_invoices", - "file_preview_threshold", - "default_modes_of_payment_section_section", - "purchase_invoice", - "journal_entry", - "column_break_21", - "expense_claim", - "ach_settings_section", - "ach_file_extension", - "ach_service_class_code", - "ach_standard_class_code", - "ach_description", - "column_break_27", - "immediate_origin", - "company_discretionary_data", - "custom_post_processing_hook", - "role_allowed_to_download_ach_file_multiple_times", - "sepa_payment_settings_section", - "initiating_party_org_id", - "debtor_org_id", - "column_break_oqnv", - "debtors_address", - "sepa_authorized_role" - ], - "fields": [ - { - "fieldname": "company", - "fieldtype": "Link", - "label": "Company", - "options": "Company" - }, - { - "fieldname": "bank_account", - "fieldtype": "Link", - "label": "Bank Account", - "options": "Bank Account" - }, - { - "fieldname": "section_break_4", - "fieldtype": "Section Break" - }, - { - "default": "1", - "fieldname": "include_purchase_invoices", - "fieldtype": "Check", - "label": "Include Purchase Invoices" - }, - { - "default": "1", - "fieldname": "include_journal_entries", - "fieldtype": "Check", - "label": "Include Journal Entries " - }, - { - "default": "1", - "fieldname": "include_expense_claims", - "fieldtype": "Check", - "label": "Include Expense Claims" - }, - { - "default": "0", - "description": "Payment Entries will be unlinked when Check Run is cancelled", - "fieldname": "allow_cancellation", - "fieldtype": "Check", - "label": "Allow Cancellation" - }, - { - "fieldname": "column_break_9", - "fieldtype": "Column Break" - }, - { - "default": "ach", - "description": "Common file extensions are 'ach', 'txt' and 'dat'. Your bank may require one of these.", - "fieldname": "ach_file_extension", - "fieldtype": "Data", - "label": "ACH File Extension" - }, - { - "default": "0", - "description": "Pre-Check all payables that have a due date greater than the Check Run's posting date", - "fieldname": "pre_check_overdue_items", - "fieldtype": "Check", - "label": "Pre-Check Overdue Items" - }, - { - "default": "0", - "description": "When a Check Run is cancelled, all Payment Entries linked to it will also be cancelled. This is not recommended.", - "fieldname": "cascade_cancellation", - "fieldtype": "Check", - "label": "Cascade Cancellation" - }, - { - "description": "Defaults to 5 if no value is provided", - "fieldname": "number_of_invoices_per_voucher", - "fieldtype": "Int", - "label": "Number of Invoices per Voucher", - "non_negative": 1 - }, - { - "fieldname": "column_break_3", - "fieldtype": "Column Break" - }, - { - "fieldname": "pay_to_account", - "fieldtype": "Link", - "label": "Payable Account", - "options": "Account" - }, - { - "fieldname": "ach_service_class_code", - "fieldtype": "Select", - "label": "ACH Service Class Code", - "options": "200\n220\n225" - }, - { - "description": "PPD is only supported Entry format at this time", - "fieldname": "ach_standard_class_code", - "fieldtype": "Select", - "label": "ACH Standard Class Code", - "options": "PPD" - }, - { - "fieldname": "ach_description", - "fieldtype": "Data", - "label": "ACH Description", - "length": 10 - }, - { - "fieldname": "print_format", - "fieldtype": "Link", - "label": "Print Format", - "options": "Print Format" - }, - { - "default": "0", - "fieldname": "split_by_address", - "fieldtype": "Check", - "label": "Split Invoices by Address" - }, - { - "fieldname": "ach_settings_section", - "fieldtype": "Section Break", - "label": "ACH Settings" - }, - { - "fieldname": "column_break_21", - "fieldtype": "Column Break" - }, - { - "default": "0", - "fieldname": "automatically_release_on_hold_invoices", - "fieldtype": "Check", - "label": "Automatically Release On Hold Invoices" - }, - { - "fieldname": "immediate_origin", - "fieldtype": "Data", - "label": "Immediate Origin" - }, - { - "fieldname": "company_discretionary_data", - "fieldtype": "Data", - "label": "Company Discretionary Data", - "length": 20 - }, - { - "fieldname": "custom_post_processing_hook", - "fieldtype": "Data", - "label": "Custom Post Processing Hook", - "read_only": 1 - }, - { - "fieldname": "default_modes_of_payment_section_section", - "fieldtype": "Section Break", - "label": "Default Modes of Payment Section" - }, - { - "fieldname": "purchase_invoice", - "fieldtype": "Link", - "label": "Purchase Invoice", - "options": "Mode of Payment" - }, - { - "fieldname": "journal_entry", - "fieldtype": "Link", - "label": "Journal Entry", - "options": "Mode of Payment" - }, - { - "fieldname": "expense_claim", - "fieldtype": "Link", - "label": "Expense Claim", - "options": "Mode of Payment" - }, - { - "fieldname": "column_break_27", - "fieldtype": "Column Break" - }, - { - "default": "1000", - "description": "File preview is enabled up to this number of transactions", - "fieldname": "file_preview_threshold", - "fieldtype": "Int", - "label": "File Preview Threshold" - }, - { - "default": "0", - "fieldname": "validate_unique_check_number", - "fieldtype": "Check", - "label": "Validate Unique Check Number" - }, - { - "description": "Users with this role are allowed to download ACH file multiple times. Users without this role are allowed to download it only once.", - "fieldname": "role_allowed_to_download_ach_file_multiple_times", - "fieldtype": "Link", - "label": "Role Allowed to Download ACH File Multiple Times", - "options": "Role" - }, - { - "fieldname": "sepa_payment_settings_section", - "fieldtype": "Section Break", - "label": "SEPA Payment Settings" - }, - { - "fieldname": "initiating_party_org_id", - "fieldtype": "Data", - "label": "Initiating Party Org Id" - }, - { - "fieldname": "debtor_org_id", - "fieldtype": "Data", - "label": "Debtor Org Id" - }, - { - "fieldname": "column_break_oqnv", - "fieldtype": "Column Break" - }, - { - "fieldname": "debtors_address", - "fieldtype": "Link", - "label": "Debtor's Address", - "options": "Address" - }, - { - "description": "Users with this role are allowed to download SEPA XML file multiple times. Users without this role are allowed to download it only once.", - "fieldname": "sepa_authorized_role", - "fieldtype": "Link", - "label": "Role Allowed to Download SEPA XML File Multiple Times", - "options": "Role" - } - ], - "links": [], - "modified": "2024-05-01 02:05:39.576718", - "modified_by": "Administrator", - "module": "Check Run", - "name": "Check Run Settings", - "naming_rule": "Expression", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Accounts Manager", - "share": 1, - "write": 1 - } - ], - "quick_entry": 1, - "sort_field": "modified", - "sort_order": "DESC", - "states": [], - "track_changes": 1 -======= "actions": [], "autoname": "format:ACC-CRS-{bank_account}-{pay_to_account}", "creation": "2022-08-22 14:43:43.533105", @@ -337,7 +24,6 @@ "split_by_address", "automatically_release_on_hold_invoices", "file_preview_threshold", - "allow_stand_alone_debit_notes", "default_modes_of_payment_section_section", "purchase_invoice", "journal_entry", @@ -352,7 +38,13 @@ "immediate_origin", "company_discretionary_data", "custom_post_processing_hook", - "role_allowed_to_download_ach_file_multiple_times" + "role_allowed_to_download_ach_file_multiple_times", + "sepa_payment_settings_section", + "initiating_party_org_id", + "debtor_org_id", + "column_break_oqnv", + "debtors_address", + "sepa_authorized_role" ], "fields": [ { @@ -367,6 +59,22 @@ "label": "Bank Account", "options": "Bank Account" }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, + { + "fieldname": "pay_to_account", + "fieldtype": "Link", + "label": "Payable Account", + "options": "Account" + }, + { + "fieldname": "print_format", + "fieldtype": "Link", + "label": "Print Format", + "options": "Print Format" + }, { "fieldname": "section_break_4", "fieldtype": "Section Break" @@ -389,6 +97,13 @@ "fieldtype": "Check", "label": "Include Expense Claims" }, + { + "default": "0", + "description": "Pre-Check all payables that have a due date greater than the Check Run's posting date", + "fieldname": "pre_check_overdue_items", + "fieldtype": "Check", + "label": "Pre-Check Overdue Items" + }, { "default": "0", "description": "Payment Entries will be unlinked when Check Run is cancelled", @@ -396,47 +111,87 @@ "fieldtype": "Check", "label": "Allow Cancellation" }, + { + "default": "0", + "description": "When a Check Run is cancelled, all Payment Entries linked to it will also be cancelled. This is not recommended.", + "fieldname": "cascade_cancellation", + "fieldtype": "Check", + "label": "Cascade Cancellation" + }, + { + "default": "0", + "fieldname": "validate_unique_check_number", + "fieldtype": "Check", + "label": "Validate Unique Check Number" + }, { "fieldname": "column_break_9", "fieldtype": "Column Break" }, { - "default": "ach", - "description": "Common file extensions are 'ach', 'txt' and 'dat'. Your bank may require one of these.", - "fieldname": "ach_file_extension", - "fieldtype": "Data", - "label": "ACH File Extension" + "description": "Defaults to 5 if no value is provided", + "fieldname": "number_of_invoices_per_voucher", + "fieldtype": "Int", + "label": "Number of Invoices per Voucher", + "non_negative": 1 }, { "default": "0", - "description": "Pre-Check all payables that have a due date greater than the Check Run's posting date", - "fieldname": "pre_check_overdue_items", + "fieldname": "split_by_address", "fieldtype": "Check", - "label": "Pre-Check Overdue Items" + "label": "Split Invoices by Address" }, { "default": "0", - "description": "When a Check Run is cancelled, all Payment Entries linked to it will also be cancelled. This is not recommended.", - "fieldname": "cascade_cancellation", + "fieldname": "automatically_release_on_hold_invoices", "fieldtype": "Check", - "label": "Cascade Cancellation" + "label": "Automatically Release On Hold Invoices" }, { - "description": "Defaults to 5 if no value is provided", - "fieldname": "number_of_invoices_per_voucher", + "default": "1000", + "description": "File preview is enabled up to this number of transactions", + "fieldname": "file_preview_threshold", "fieldtype": "Int", - "label": "Number of Invoices per Voucher", - "non_negative": 1 + "label": "File Preview Threshold" }, { - "fieldname": "column_break_3", + "fieldname": "default_modes_of_payment_section_section", + "fieldtype": "Section Break", + "label": "Default Modes of Payment Section" + }, + { + "fieldname": "purchase_invoice", + "fieldtype": "Link", + "label": "Purchase Invoice", + "options": "Mode of Payment" + }, + { + "fieldname": "journal_entry", + "fieldtype": "Link", + "label": "Journal Entry", + "options": "Mode of Payment" + }, + { + "fieldname": "column_break_21", "fieldtype": "Column Break" }, { - "fieldname": "pay_to_account", + "fieldname": "expense_claim", "fieldtype": "Link", - "label": "Payable Account", - "options": "Account" + "label": "Expense Claim", + "options": "Mode of Payment" + }, + { + "fieldname": "ach_settings_section", + "fieldtype": "Section Break", + "label": "ACH Settings" + }, + { + "default": "ach", + "description": "Common file extensions are 'ach', 'txt' and 'dat'. Your bank may require one of these.", + "fieldname": "ach_file_extension", + "fieldtype": "Data", + "label": "ACH File Extension" }, { "fieldname": "ach_service_class_code", @@ -458,32 +213,9 @@ "length": 10 }, { - "fieldname": "print_format", - "fieldtype": "Link", - "label": "Print Format", - "options": "Print Format" - }, - { - "default": "0", - "fieldname": "split_by_address", - "fieldtype": "Check", - "label": "Split Invoices by Address" - }, - { - "fieldname": "ach_settings_section", - "fieldtype": "Section Break", - "label": "ACH Settings" - }, - { - "fieldname": "column_break_21", + "fieldname": "column_break_27", "fieldtype": "Column Break" }, - { - "default": "0", - "fieldname": "automatically_release_on_hold_invoices", - "fieldtype": "Check", - "label": "Automatically Release On Hold Invoices" - }, { "fieldname": "immediate_origin", "fieldtype": "Data", @@ -502,62 +234,47 @@ "read_only": 1 }, { - "fieldname": "default_modes_of_payment_section_section", - "fieldtype": "Section Break", - "label": "Default Modes of Payment Section" - }, - { - "fieldname": "purchase_invoice", - "fieldtype": "Link", - "label": "Purchase Invoice", - "options": "Mode of Payment" - }, - { - "fieldname": "journal_entry", + "description": "Users with this role are allowed to download ACH file multiple times. Users without this role are allowed to download it only once.", + "fieldname": "role_allowed_to_download_ach_file_multiple_times", "fieldtype": "Link", - "label": "Journal Entry", - "options": "Mode of Payment" + "label": "Role Allowed to Download ACH File Multiple Times", + "options": "Role" }, { - "fieldname": "expense_claim", - "fieldtype": "Link", - "label": "Expense Claim", - "options": "Mode of Payment" + "fieldname": "sepa_payment_settings_section", + "fieldtype": "Section Break", + "label": "SEPA Payment Settings" }, { - "fieldname": "column_break_27", - "fieldtype": "Column Break" + "fieldname": "initiating_party_org_id", + "fieldtype": "Data", + "label": "Initiating Party Org Id" }, { - "default": "1000", - "description": "File preview is enabled up to this number of transactions", - "fieldname": "file_preview_threshold", - "fieldtype": "Int", - "label": "File Preview Threshold" + "fieldname": "debtor_org_id", + "fieldtype": "Data", + "label": "Debtor Org Id" }, { - "default": "0", - "fieldname": "validate_unique_check_number", - "fieldtype": "Check", - "label": "Validate Unique Check Number" + "fieldname": "column_break_oqnv", + "fieldtype": "Column Break" }, { - "default": "No", - "fieldname": "allow_stand_alone_debit_notes", - "fieldtype": "Select", - "label": "Allow stand-alone debit notes?", - "options": "Yes\nNo" + "fieldname": "debtors_address", + "fieldtype": "Link", + "label": "Debtor's Address", + "options": "Address" }, { - "description": "Users with this role are allowed to download ACH file multiple times. Users without this role are allowed to download it only once.", - "fieldname": "role_allowed_to_download_ach_file_multiple_times", + "description": "Users with this role are allowed to download SEPA XML file multiple times. Users without this role are allowed to download it only once.", + "fieldname": "sepa_authorized_role", "fieldtype": "Link", - "label": "Role Allowed to Download ACH File Multiple Times", + "label": "Role Allowed to Download SEPA XML File Multiple Times", "options": "Role" } ], "links": [], - "modified": "2024-04-29 08:51:46.252826", + "modified": "2025-01-21 04:31:25.766823", "modified_by": "Administrator", "module": "Check Run", "name": "Check Run Settings", @@ -594,4 +311,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +}