From bb100db815531307e602b18ba259e380c69be894 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Thu, 21 Mar 2024 20:11:15 -0400 Subject: [PATCH 01/16] wip: payment entry saves outstanding amount is not updated some other warnings need to be defeated --- .pre-commit-config.yaml | 2 +- .../custom/sales_taxes_and_charges.json | 236 ++++++++++++++++++ .../check_run/doctype/check_run/check_run.py | 45 +++- check_run/hooks.py | 4 +- check_run/overrides/payment_entry.py | 139 +++++++++-- check_run/overrides/sales_invoice.py | 54 ++++ .../overrides/sales_taxes_and_charges.py | 13 + check_run/public/js/check_run/CheckRun.vue | 2 +- check_run/tests/fixtures.py | 110 ++++++++ check_run/tests/setup.py | 97 ++++++- 10 files changed, 678 insertions(+), 24 deletions(-) create mode 100644 check_run/check_run/custom/sales_taxes_and_charges.json create mode 100644 check_run/overrides/sales_invoice.py create mode 100644 check_run/overrides/sales_taxes_and_charges.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bbdc3b2f..237555f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,7 @@ repos: additional_dependencies: ['flake8-bugbear'] - repo: https://github.com/agritheory/test_utils - rev: v1.20.0 + rev: v1.20.4 hooks: - id: update_pre_commit_config - id: validate_frappe_project diff --git a/check_run/check_run/custom/sales_taxes_and_charges.json b/check_run/check_run/custom/sales_taxes_and_charges.json new file mode 100644 index 00000000..aa1ccf75 --- /dev/null +++ b/check_run/check_run/custom/sales_taxes_and_charges.json @@ -0,0 +1,236 @@ +{ + "custom_fields": [ + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": null, + "description": "Computed from Party's Default Payment Terms Template", + "dt": "Sales Taxes and Charges", + "fetch_if_empty": 0, + "fieldname": "due_date", + "fieldtype": "Date", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "idx": 12, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "rate", + "is_system_generated": 0, + "is_virtual": 0, + "label": "Due Date", + "length": 0, + "module": "Check Run", + "name": "Sales Taxes and Charges-due_date", + "no_copy": 0, + "non_negative": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "show_dashboard": 0, + "sort_options": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": null, + "dt": "Sales Taxes and Charges", + "fetch_if_empty": 0, + "fieldname": "party", + "fieldtype": "Dynamic Link", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "idx": 16, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "party_type", + "is_system_generated": 0, + "is_virtual": 0, + "label": "Party", + "length": 0, + "module": "Check Run", + "name": "Sales Taxes and Charges-party", + "no_copy": 0, + "non_negative": 0, + "options": "party_type", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "show_dashboard": 0, + "sort_options": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": null, + "dt": "Sales Taxes and Charges", + "fetch_if_empty": 0, + "fieldname": "column_break_w4usy", + "fieldtype": "Column Break", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "idx": 14, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "due_date", + "is_system_generated": 0, + "is_virtual": 0, + "length": 0, + "module": "Check Run", + "name": "Sales Taxes and Charges-column_break_w4usy", + "no_copy": 0, + "non_negative": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "show_dashboard": 0, + "sort_options": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": null, + "dt": "Sales Taxes and Charges", + "fetch_if_empty": 0, + "fieldname": "party_type", + "fieldtype": "Link", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "idx": 15, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "column_break_w4usy", + "is_system_generated": 0, + "is_virtual": 0, + "label": "Party Type", + "length": 0, + "module": "Check Run", + "name": "Sales Taxes and Charges-party_type", + "no_copy": 0, + "non_negative": 0, + "options": "DocType", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "show_dashboard": 0, + "sort_options": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": null, + "dt": "Sales Taxes and Charges", + "fetch_if_empty": 0, + "fieldname": "outstanding_amount", + "fieldtype": "Currency", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "idx": 25, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "base_tax_amount_after_discount_amount", + "is_system_generated": 0, + "is_virtual": 0, + "label": "Outstanding Amount", + "length": 0, + "module": "Check Run", + "name": "Sales Taxes and Charges-outstanding_amount", + "no_copy": 0, + "non_negative": 0, + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "show_dashboard": 0, + "sort_options": 0, + "translatable": 0, + "unique": 0 + } + ], + "doctype": "Sales Taxes and Charges", + "property_setters": [ + { + "doc_type": "Sales Taxes and Charges", + "doctype_or_field": "DocType", + "idx": 0, + "is_system_generated": 0, + "module": "Check Run", + "name": "Sales Taxes and Charges-main-field_order", + "property": "field_order", + "property_type": "Data", + "value": "[\"charge_type\", \"row_id\", \"account_head\", \"col_break_1\", \"description\", \"included_in_print_rate\", \"included_in_paid_amount\", \"accounting_dimensions_section\", \"cost_center\", \"dimension_col_break\", \"section_break_8\", \"rate\", \"due_date\", \"column_break_w4usy\", \"party_type\", \"party\", \"section_break_9\", \"account_currency\", \"tax_amount\", \"total\", \"tax_amount_after_discount_amount\", \"column_break_13\", \"base_tax_amount\", \"base_total\", \"base_tax_amount_after_discount_amount\", \"outstanding_amount\", \"item_wise_tax_detail\", \"dont_recompute_tax\"]" + } + ], + "sync_on_migrate": 1 +} \ No newline at end of file diff --git a/check_run/check_run/doctype/check_run/check_run.py b/check_run/check_run/doctype/check_run/check_run.py index 39440b95..811b8373 100644 --- a/check_run/check_run/doctype/check_run/check_run.py +++ b/check_run/check_run/doctype/check_run/check_run.py @@ -323,6 +323,8 @@ def create_payment_entries(self, transactions: list[frappe._dict]) -> list[frapp party = frappe.db.get_value("Expense Claim", group[0].name, "employee") elif group[0].doctype == "Journal Entry": party = frappe.db.get_value("Journal Entry Account", group[0].name, "party") + elif group[0].doctype == "Sales Invoice": + party = group[0].party pe = frappe.new_doc("Payment Entry") pe.payment_type = "Pay" pe.posting_date = ( @@ -368,14 +370,17 @@ def create_payment_entries(self, transactions: list[frappe._dict]) -> list[frapp discount_amount, has_discount = calculate_payment_term_discount(reference, self.posting_date) total_discount_amount += discount_amount - if reference.doctype == "Journal Entry": + if reference.doctype in ("Journal Entry", "Sales Invoice"): reference_name = reference.ref_number else: reference_name = reference.name or reference.ref_number + pe.append( "references", { - "reference_doctype": reference.doctype, + "reference_doctype": reference.doctype + if reference.doctype != "Sales Invoice" + else "Sales Taxes and Charges", "reference_name": reference_name, "due_date": reference.get("due_date"), "outstanding_amount": flt(reference.amount), @@ -797,6 +802,39 @@ def get_entries(doc: CheckRun | str) -> dict: .where((journal_entries.name).notin(sub_q)) # codespell:ignore ) + # build Sales Taxes and Charges query + sales_taxes = frappe.qb.DocType("Sales Taxes and Charges") + sales_invoice = frappe.qb.DocType("Sales Invoice") + st_qb = ( + frappe.qb.from_(sales_taxes) + .inner_join(sales_invoice) + .on(sales_taxes.parent == sales_invoice.name) + .inner_join(suppliers) + .on(suppliers.name == sales_taxes.party) + .select( + ConstantColumn("Sales Invoice").as_("doctype"), + sales_taxes.party_type, + sales_taxes.parent.as_("ref_number"), + sales_taxes.name, + sales_taxes.party, + (sales_taxes.party).as_("party_name"), + (sales_taxes.tax_amount_after_discount_amount).as_("amount"), + Coalesce(sales_taxes.due_date, sales_invoice.posting_date).as_("due_date"), + sales_invoice.posting_date, + Coalesce( + NullIf(suppliers.supplier_default_mode_of_payment, ""), + f"{settings.tax_payable}" or "\n", + ).as_("mode_of_payment"), + ConstantColumn("").as_("payment_term"), + ) + .where(sales_invoice.company == company) + .where(sales_invoice.docstatus == 1) + .where(sales_taxes.account_head == pay_to_account) + .where(sales_invoice.posting_date <= end_date) + .where(sales_invoice.outstanding_amount > 0.0) + # .where((sales_taxes.name).notin(sub_q)) # TODO: reference not in payment entry references + ) + if not settings: query = pi_qb.union(ec_qb).union(je_qb) else: @@ -805,8 +843,9 @@ def get_entries(doc: CheckRun | str) -> dict: settings.include_purchase_invoices, settings.include_expense_claims, settings.include_journal_entries, + settings.include_tax_payable, ) - for flag, qb in zip(flags, (pi_qb, ec_qb, je_qb)): + for flag, qb in zip(flags, (pi_qb, ec_qb, je_qb, st_qb)): if not flag: continue if not query: diff --git a/check_run/hooks.py b/check_run/hooks.py index fca4d6a5..aa8667e5 100644 --- a/check_run/hooks.py +++ b/check_run/hooks.py @@ -100,9 +100,11 @@ # DocType Class # --------------- # Override standard doctype classes + override_doctype_class = { - # "Bank": "check_run.overrides.bank.CustomBank", "Payment Entry": "check_run.overrides.payment_entry.CheckRunPaymentEntry", + "Sales Invoice": "check_run.overrides.sales_invoice.CheckRunSalesInvoice", + "Sales Taxes and Charges": "check_run.overrides.sales_taxes_and_charges.CheckRunSalesTaxesandCharges", } # Document Events diff --git a/check_run/overrides/payment_entry.py b/check_run/overrides/payment_entry.py index 6075bc47..6c1e1fc8 100644 --- a/check_run/overrides/payment_entry.py +++ b/check_run/overrides/payment_entry.py @@ -3,8 +3,12 @@ import base64 import copy +import json import frappe +from erpnext.accounts.doctype.invoice_discounting.invoice_discounting import ( + get_party_account_based_on_invoice_discounting, +) from erpnext.accounts.doctype.payment_entry.payment_entry import ( PaymentEntry, add_regional_gl_entries, @@ -22,9 +26,9 @@ validate_disabled_accounts, ) from erpnext.accounts.utils import get_payment_ledger_entries, is_immutable_ledger_enabled -from frappe import _, safe_decode +from frappe import _, safe_decode, scrub from frappe.core.doctype.file.utils import get_local_image -from frappe.utils import flt, get_link_to_form, now +from frappe.utils import comma_and, comma_or, flt, get_link_to_form, now from frappe.utils.data import getdate @@ -91,12 +95,84 @@ def get_valid_reference_doctypes(self): if self.party_type == "Customer": return ("Sales Order", "Sales Invoice", "Journal Entry", "Dunning") elif self.party_type == "Supplier": - return ("Purchase Order", "Purchase Invoice", "Journal Entry") + return ( + "Purchase Order", + "Purchase Invoice", + "Journal Entry", + "Sales Taxes and Charges", + ) # Tax Payable elif self.party_type == "Shareholder": return ("Journal Entry",) elif self.party_type == "Employee": return ("Journal Entry", "Expense Claim") # Expense Claim + def validate_reference_documents(self): + valid_reference_doctypes = self.get_valid_reference_doctypes() + + if not valid_reference_doctypes: + return + + for d in self.get("references"): + if not d.allocated_amount: + continue + if d.reference_doctype not in valid_reference_doctypes: + frappe.throw( + _("Reference Doctype must be one of {0}").format( + comma_or(_(d) for d in valid_reference_doctypes) + ) + ) + + elif d.reference_name: + if not frappe.db.exists(d.reference_doctype, d.reference_name): + frappe.throw(_("{0} {1} does not exist").format(d.reference_doctype, d.reference_name)) + else: + ref_doc = frappe.get_doc(d.reference_doctype, d.reference_name) + if d.reference_doctype == "Sales Taxes and Charges": + if self.party != ref_doc.party: + frappe.throw( + _("{0} {1} is not associated with {2} {3}").format( + _(d.reference_doctype), d.reference_name, _(self.party_type), self.party + ) + ) + elif d.reference_doctype != "Journal Entry": + if self.party != ref_doc.get(scrub(self.party_type)): + frappe.throw( + _("{0} {1} is not associated with {2} {3}").format( + _(d.reference_doctype), d.reference_name, _(self.party_type), self.party + ) + ) + else: + self.validate_journal_entry() + + if d.reference_doctype in frappe.get_hooks("invoice_doctypes"): + if self.party_type == "Customer": + ref_party_account = ( + get_party_account_based_on_invoice_discounting(d.reference_name) or ref_doc.debit_to + ) + elif self.party_type == "Supplier": + ref_party_account = ref_doc.credit_to + elif self.party_type == "Employee": + ref_party_account = ref_doc.payable_account + + if ( + ref_party_account != self.party_account + and not self.book_advance_payments_in_separate_party_account + ): + frappe.throw( + _("{0} {1} is associated with {2}, but Party Account is {3}").format( + _(d.reference_doctype), d.reference_name, ref_party_account, self.party_account + ) + ) + + if ref_doc.doctype == "Purchase Invoice" and ref_doc.get("on_hold"): + frappe.throw( + _("{0} {1} is on hold").format(_(d.reference_doctype), d.reference_name), + title=_("Invalid Purchase Invoice"), + ) + + if ref_doc.docstatus != 1: + frappe.throw(_("{0} {1} must be submitted").format(_(d.reference_doctype), d.reference_name)) + """ Because Check Run processes multiple payment entries in a background queue, errors generally do not include enough data to identify the problem since there were written and remain appropriate for the context of an individual @@ -177,20 +253,22 @@ def validate_allocated_amount_with_latest_data(self): d = frappe._dict(d) latest_lookup.setdefault((d.voucher_type, d.voucher_no), frappe._dict())[d.payment_term] = d - for idx, d in enumerate(self.get("references"), start=1): - latest = latest_lookup.get((d.reference_doctype, d.reference_name)) or frappe._dict() - - # If term based allocation is enabled, throw - if ( - d.payment_term is None or d.payment_term == "" - ) and self.term_based_allocation_enabled_for_reference( - d.reference_doctype, d.reference_name - ): - frappe.throw( - _( - "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section" - ).format(frappe.bold(d.reference_name), frappe.bold(idx)) - ) + for idx, d in enumerate(self.get("references"), start=1): + if d.reference_doctype == "Sales Taxes and Charges": + continue + latest = latest_lookup.get((d.reference_doctype, d.reference_name)) or frappe._dict() + + # If term based allocation is enabled, throw + if ( + d.payment_term is None or d.payment_term == "" + ) and self.term_based_allocation_enabled_for_reference( + d.reference_doctype, d.reference_name + ): + frappe.throw( + _( + "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section" + ).format(frappe.bold(d.reference_name), frappe.bold(idx)) + ) # if no payment template is used by invoice and has a custom term(no `payment_term`), then invoice outstanding will be in 'None' key latest = latest.get(d.payment_term) or latest.get(None) @@ -623,3 +701,30 @@ def set_voided_date(doctype, docname, voided_date): title=_("Invalid Void As Of Date"), ) frappe.db.set_value(doctype, docname, "voided_date", voided_date, update_modified=False) + + +def validate_add_payment_term(doc: PaymentEntry, method: str | None = None): + doc = frappe._dict(json.loads(doc)) if isinstance(doc, str) else doc + if doc.check_run: + return + adjusted_refs = [] + for r in doc.get("references"): + if r.reference_doctype == "Purchase Invoice" and not r.payment_term: + pmt_term = frappe.get_all( + "Payment Schedule", + {"parent": r.reference_name, "outstanding": [">", 0.0]}, + ["payment_term"], + order_by="due_date ASC", + limit=1, + ) + if pmt_term: + r.payment_term = pmt_term[0].get("payment_term") + adjusted_refs.append(r.reference_name) + if adjusted_refs: + frappe.msgprint( + msg=frappe._( + f"An outstanding Payment Schedule term was detected and added for {comma_and(adjusted_refs)} in the references table.
Please review - " + "this field must be filled in for the Payment Schedule to synchronize and to prevent a paid invoice portion from showing up in a Check Run." + ), + title=frappe._("Payment Schedule Term Added"), + ) diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py new file mode 100644 index 00000000..4d1db8cd --- /dev/null +++ b/check_run/overrides/sales_invoice.py @@ -0,0 +1,54 @@ +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt + +import frappe +from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice +from erpnext.accounts.utils import get_account_currency +from erpnext.accounts.party import get_due_date +from frappe.utils.data import cint, flt + + +class CheckRunSalesInvoice(SalesInvoice): + # TODO: update due date in taxes with validate hook + def validate(self): + for row in self.taxes: + if not row.party: + continue + due_date = get_due_date(self.posting_date, row.party_type, row.party, self.company) + row.due_date = due_date or self.posting_date + row.outstanding_amount = row.tax_amount + super().validate() + + def on_submit(self): + for row in self.taxes: + row.outstanding_amount = row.tax_amount + super().validate() + + def make_tax_gl_entries(self, gl_entries): + enable_discount_accounting = cint( + frappe.db.get_single_value("Selling Settings", "enable_discount_accounting") + ) + + for tax in self.get("taxes"): + amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting) + if flt(tax.base_tax_amount_after_discount_amount): + account_currency = get_account_currency(tax.account_head) + gl_entries.append( + self.get_gl_dict( + { + "account": tax.account_head, + "against": self.customer, + "credit": flt(base_amount, tax.precision("tax_amount_after_discount_amount")), + "credit_in_account_currency": ( + flt(base_amount, tax.precision("base_tax_amount_after_discount_amount")) + if account_currency == self.company_currency + else flt(amount, tax.precision("tax_amount_after_discount_amount")) + ), + "cost_center": tax.cost_center, + "party_type": tax.party_type, + "party": tax.party, + }, + account_currency, + item=tax, + ) + ) diff --git a/check_run/overrides/sales_taxes_and_charges.py b/check_run/overrides/sales_taxes_and_charges.py new file mode 100644 index 00000000..3e307eb8 --- /dev/null +++ b/check_run/overrides/sales_taxes_and_charges.py @@ -0,0 +1,13 @@ +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt + +import frappe +from erpnext.accounts.doctype.sales_taxes_and_charges.sales_taxes_and_charges import ( + SalesTaxesandCharges, +) + + +class CheckRunSalesTaxesandCharges(SalesTaxesandCharges): + @property + def company(self): + return frappe.get_value("Sales Invoice", self.parent, "company") diff --git a/check_run/public/js/check_run/CheckRun.vue b/check_run/public/js/check_run/CheckRun.vue index 8d0e0f3f..9c5793ff 100644 --- a/check_run/public/js/check_run/CheckRun.vue +++ b/check_run/public/js/check_run/CheckRun.vue @@ -106,7 +106,7 @@ {{ item.party_name || item.party }} - {{ item.ref_number || item.name }} + {{ item.doctype != 'Sales Invoice' ? item.ref_number : item.name }}
Date: Mon, 1 Apr 2024 17:57:14 -0400 Subject: [PATCH 02/16] feat: sales tax payable workflow --- .../check_run/doctype/check_run/check_run.py | 4 +- check_run/hooks.py | 1 + check_run/overrides/payment_entry.py | 15 +++ check_run/overrides/sales_invoice.py | 107 +++++++++--------- check_run/public/js/check_run/CheckRun.vue | 4 + docs/sales_tax_payable.md | 8 ++ 6 files changed, 84 insertions(+), 55 deletions(-) create mode 100644 docs/sales_tax_payable.md diff --git a/check_run/check_run/doctype/check_run/check_run.py b/check_run/check_run/doctype/check_run/check_run.py index 811b8373..d24f1a20 100644 --- a/check_run/check_run/doctype/check_run/check_run.py +++ b/check_run/check_run/doctype/check_run/check_run.py @@ -831,8 +831,8 @@ def get_entries(doc: CheckRun | str) -> dict: .where(sales_invoice.docstatus == 1) .where(sales_taxes.account_head == pay_to_account) .where(sales_invoice.posting_date <= end_date) - .where(sales_invoice.outstanding_amount > 0.0) - # .where((sales_taxes.name).notin(sub_q)) # TODO: reference not in payment entry references + .where(sales_taxes.outstanding_amount > 0.0) + # .where((sales_taxes.name).notin(sub_q)) # TODO: reference not in payment entry references - not strictly required ) if not settings: diff --git a/check_run/hooks.py b/check_run/hooks.py index aa8667e5..e91efffc 100644 --- a/check_run/hooks.py +++ b/check_run/hooks.py @@ -120,6 +120,7 @@ "on_submit": [ "check_run.overrides.payment_entry.update_outstanding_amount", "check_run.overrides.payment_entry.update_check_number", + "check_run.overrides.payment_entry.update_sales_tax_payable_outstanding", ], "on_cancel": [ "check_run.overrides.payment_entry.update_outstanding_amount", diff --git a/check_run/overrides/payment_entry.py b/check_run/overrides/payment_entry.py index 6c1e1fc8..31226d65 100644 --- a/check_run/overrides/payment_entry.py +++ b/check_run/overrides/payment_entry.py @@ -728,3 +728,18 @@ def validate_add_payment_term(doc: PaymentEntry, method: str | None = None): ), title=frappe._("Payment Schedule Term Added"), ) + + +@frappe.whitelist() +def update_sales_tax_payable_outstanding(doc, method=None): + for r in doc.get("references"): + if r.reference_doctype == "Sales Taxes and Charges": + currently_outstanding = frappe.db.get_value( + "Sales Taxes and Charges", r.reference_name, "outstanding_amount" + ) + frappe.db.set_value( + "Sales Taxes and Charges", + r.reference_name, + "outstanding_amount", + flt(currently_outstanding - r.allocated_amount), + ) diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index 4d1db8cd..a5dce1fe 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -1,54 +1,55 @@ -# Copyright (c) 2026, AgriTheory and contributors -# For license information, please see license.txt - -import frappe -from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice -from erpnext.accounts.utils import get_account_currency -from erpnext.accounts.party import get_due_date -from frappe.utils.data import cint, flt - - -class CheckRunSalesInvoice(SalesInvoice): - # TODO: update due date in taxes with validate hook - def validate(self): - for row in self.taxes: - if not row.party: - continue - due_date = get_due_date(self.posting_date, row.party_type, row.party, self.company) - row.due_date = due_date or self.posting_date - row.outstanding_amount = row.tax_amount - super().validate() - - def on_submit(self): - for row in self.taxes: - row.outstanding_amount = row.tax_amount - super().validate() - - def make_tax_gl_entries(self, gl_entries): - enable_discount_accounting = cint( - frappe.db.get_single_value("Selling Settings", "enable_discount_accounting") - ) - - for tax in self.get("taxes"): - amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting) - if flt(tax.base_tax_amount_after_discount_amount): - account_currency = get_account_currency(tax.account_head) - gl_entries.append( - self.get_gl_dict( - { - "account": tax.account_head, - "against": self.customer, - "credit": flt(base_amount, tax.precision("tax_amount_after_discount_amount")), - "credit_in_account_currency": ( - flt(base_amount, tax.precision("base_tax_amount_after_discount_amount")) - if account_currency == self.company_currency - else flt(amount, tax.precision("tax_amount_after_discount_amount")) - ), - "cost_center": tax.cost_center, - "party_type": tax.party_type, - "party": tax.party, - }, - account_currency, - item=tax, - ) +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt + +import frappe +from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice +from erpnext.accounts.party import get_due_date +from erpnext.accounts.utils import get_account_currency +from frappe.utils.data import cint, flt + + +class CheckRunSalesInvoice(SalesInvoice): + # TODO: update due date in taxes with validate hook + def validate(self): + for row in self.taxes: + if not row.party: + continue + due_date = get_due_date(self.posting_date, row.party_type, row.party, self.company) + row.due_date = due_date or self.posting_date + row.outstanding_amount = row.tax_amount + super().validate() + + def on_submit(self): + for row in self.taxes: + if row.party and row.party_type: + row.outstanding_amount = row.tax_amount + super().validate() + + def make_tax_gl_entries(self, gl_entries): + enable_discount_accounting = cint( + frappe.db.get_single_value("Selling Settings", "enable_discount_accounting") + ) + + for tax in self.get("taxes"): + amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting) + if flt(tax.base_tax_amount_after_discount_amount): + account_currency = get_account_currency(tax.account_head) + gl_entries.append( + self.get_gl_dict( + { + "account": tax.account_head, + "against": self.customer, + "credit": flt(base_amount, tax.precision("tax_amount_after_discount_amount")), + "credit_in_account_currency": ( + flt(base_amount, tax.precision("base_tax_amount_after_discount_amount")) + if account_currency == self.company_currency + else flt(amount, tax.precision("tax_amount_after_discount_amount")) + ), + "cost_center": tax.cost_center, + "party_type": tax.party_type, + "party": tax.party, + }, + account_currency, + item=tax, + ) ) diff --git a/check_run/public/js/check_run/CheckRun.vue b/check_run/public/js/check_run/CheckRun.vue index 9c5793ff..6724b944 100644 --- a/check_run/public/js/check_run/CheckRun.vue +++ b/check_run/public/js/check_run/CheckRun.vue @@ -240,6 +240,10 @@ let datetime = computed(() => { return unref(window.frappe.datetime) }) +let pay_to_account_currency = computed(() => { + return unref(frm.fields_dict.pay_to_account.df.options) +}) + onMounted(() => { window.check_run.get_entries(window.cur_frm) }) diff --git a/docs/sales_tax_payable.md b/docs/sales_tax_payable.md new file mode 100644 index 00000000..fd8882e8 --- /dev/null +++ b/docs/sales_tax_payable.md @@ -0,0 +1,8 @@ + + +# Sales Tax Payable + +By noting the Party Type and Party in the Sales Taxes and Charges table of a Sales Invoice, the user can opt to record the Sales Tax as payable and note the party. An Outstanding Amount will be created on submit to track which rows have been satisfied. + +In Check Run Settings, set the "Include Tax Payable from Sales Invoices" create a Check Run with these options. Given the large number of rows that may be included in a given period, enabling the secondary print format feature is recommended. \ No newline at end of file From 5f5fc89eecbb6de6e6d0e1c6a2506ff3c5802200 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Thu, 21 Mar 2024 20:13:44 -0400 Subject: [PATCH 03/16] fix: submit sales invoices in setup script --- check_run/tests/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_run/tests/setup.py b/check_run/tests/setup.py index e4f0738f..f4316552 100644 --- a/check_run/tests/setup.py +++ b/check_run/tests/setup.py @@ -1139,4 +1139,4 @@ def create_sales_invoices(settings): for tax in taxes: si.append("taxes", tax) si.save() - # si.submit() + si.submit() From 172ed61b6bbd5c10ca4f23ee7fcab348570f0cd0 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Thu, 21 Mar 2024 20:11:15 -0400 Subject: [PATCH 04/16] wip: payment entry saves outstanding amount is not updated some other warnings need to be defeated --- check_run/check_run/doctype/check_run/check_run.py | 1 - 1 file changed, 1 deletion(-) diff --git a/check_run/check_run/doctype/check_run/check_run.py b/check_run/check_run/doctype/check_run/check_run.py index d24f1a20..4b0abc74 100644 --- a/check_run/check_run/doctype/check_run/check_run.py +++ b/check_run/check_run/doctype/check_run/check_run.py @@ -832,7 +832,6 @@ def get_entries(doc: CheckRun | str) -> dict: .where(sales_taxes.account_head == pay_to_account) .where(sales_invoice.posting_date <= end_date) .where(sales_taxes.outstanding_amount > 0.0) - # .where((sales_taxes.name).notin(sub_q)) # TODO: reference not in payment entry references - not strictly required ) if not settings: From 8d796e1988941e758e6eb07f225b37e603fe76f5 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Wed, 8 May 2024 16:34:37 -0400 Subject: [PATCH 05/16] feat: only include party is account is payable --- check_run/check_run/custom/sales_taxes_and_charges.json | 2 +- check_run/overrides/sales_invoice.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/check_run/check_run/custom/sales_taxes_and_charges.json b/check_run/check_run/custom/sales_taxes_and_charges.json index aa1ccf75..9124bc7f 100644 --- a/check_run/check_run/custom/sales_taxes_and_charges.json +++ b/check_run/check_run/custom/sales_taxes_and_charges.json @@ -233,4 +233,4 @@ } ], "sync_on_migrate": 1 -} \ No newline at end of file +} diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index a5dce1fe..43329112 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -34,6 +34,9 @@ def make_tax_gl_entries(self, gl_entries): amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting) if flt(tax.base_tax_amount_after_discount_amount): account_currency = get_account_currency(tax.account_head) + is_payable_account = bool( + frappe.get_value("Account", tax.account_head, "account_type") == "Payable" + ) gl_entries.append( self.get_gl_dict( { @@ -46,8 +49,8 @@ def make_tax_gl_entries(self, gl_entries): else flt(amount, tax.precision("tax_amount_after_discount_amount")) ), "cost_center": tax.cost_center, - "party_type": tax.party_type, - "party": tax.party, + "party_type": tax.party_type if is_payable_account else None, + "party": tax.party if is_payable_account else None, }, account_currency, item=tax, From 7799eaaadbb8b6a6bbdfa8923b705d747cb82f6d Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Tue, 4 Jun 2024 20:39:00 -0400 Subject: [PATCH 06/16] feat/tests: add accounting dimensions sensitivity, tests --- check_run/overrides/sales_invoice.py | 6 +++ check_run/tests/test_tax_payable.py | 72 ++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 check_run/tests/test_tax_payable.py diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index 43329112..4fbac88e 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -2,6 +2,9 @@ # For license information, please see license.txt import frappe +from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( + get_accounting_dimensions, +) from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice from erpnext.accounts.party import get_due_date from erpnext.accounts.utils import get_account_currency @@ -30,6 +33,7 @@ def make_tax_gl_entries(self, gl_entries): frappe.db.get_single_value("Selling Settings", "enable_discount_accounting") ) + accounting_dimensions = get_accounting_dimensions() for tax in self.get("taxes"): amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting) if flt(tax.base_tax_amount_after_discount_amount): @@ -37,6 +41,7 @@ def make_tax_gl_entries(self, gl_entries): is_payable_account = bool( frappe.get_value("Account", tax.account_head, "account_type") == "Payable" ) + dimensions = {d: tax.get(d) for d in accounting_dimensions} gl_entries.append( self.get_gl_dict( { @@ -51,6 +56,7 @@ def make_tax_gl_entries(self, gl_entries): "cost_center": tax.cost_center, "party_type": tax.party_type if is_payable_account else None, "party": tax.party if is_payable_account else None, + **dimensions, }, account_currency, item=tax, diff --git a/check_run/tests/test_tax_payable.py b/check_run/tests/test_tax_payable.py new file mode 100644 index 00000000..4cd98fbc --- /dev/null +++ b/check_run/tests/test_tax_payable.py @@ -0,0 +1,72 @@ +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt + +import datetime +import json + +import frappe +import pytest +from frappe.utils import flt + +from check_run.check_run.doctype.check_run.check_run import ( + check_for_draft_check_run, + get_check_run_settings, + get_entries, +) + +year = datetime.date.today().year + + +@pytest.fixture +def tax_payable_cr(): # return draft check run + cr_name = check_for_draft_check_run( + company="Chelsea Fruit Co", + bank_account="Primary Checking - Local Bank", + payable_account="2320 - Sales Tax Payable - CFC", + ) + cr = frappe.get_doc("Check Run", cr_name) + cr.flags.in_test = True + cr.posting_date = cr.end_date = datetime.date(year, 12, 31) + cr.set_last_check_number() + cr.set_default_payable_account() + cr.save() + # Need CR Settings in place to call get_entries + crs = get_check_run_settings(cr) + crs.include_tax_payable = 1 + crs.number_of_invoices_per_voucher = 100 + crs.save() + entries = get_entries(cr) + for row in entries.get("transactions"): + row["pay"] = True + cr.transactions = frappe.as_json(entries.get("transactions")) + cr.save() + return cr + + +def test_tax_payable_gl(): + sis = [ + frappe.get_doc("Sales Invoice", si) for si in frappe.get_all("Sales Invoice", pluck="name") + ] + for doc in sis: + precision = frappe.get_precision(doc.doctype, "grand_total") + doc.submit() + gl1 = frappe.get_doc( + "GL Entry", {"voucher_no": doc.name, "account": "2320 - Sales Tax Payable - CFC"} + ) + assert flt(gl1.credit, precision) == doc.total_taxes_and_charges + assert gl1.party == "Massachusetts Department of Revenue" + + +def test_tax_payable_check_run(tax_payable_cr): + cr = tax_payable_cr + transactions = json.loads(cr.transactions) + for t in transactions: + t["pay"] = True + assert t.get("doctype") == "Sales Invoice" + assert t.get("party") == "Massachusetts Department of Revenue" + cr.process_check_run() + + entries = get_entries(cr) + transactions = entries.get("transactions") + pe_name = transactions[0].get("payment_entry") + assert all([pe_name == t.get("payment_entry") for t in transactions]) From 62512a121f9ce840c0ac2a7518ed65a332e4cd15 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Tue, 18 Jun 2024 12:14:28 -0400 Subject: [PATCH 07/16] tests: add check for due date on payables --- check_run/overrides/sales_invoice.py | 1 - check_run/tests/test_tax_payable.py | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index 4fbac88e..fd58c190 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -12,7 +12,6 @@ class CheckRunSalesInvoice(SalesInvoice): - # TODO: update due date in taxes with validate hook def validate(self): for row in self.taxes: if not row.party: diff --git a/check_run/tests/test_tax_payable.py b/check_run/tests/test_tax_payable.py index 4cd98fbc..dd085430 100644 --- a/check_run/tests/test_tax_payable.py +++ b/check_run/tests/test_tax_payable.py @@ -5,6 +5,7 @@ import json import frappe +from erpnext.accounts.party import get_due_date import pytest from frappe.utils import flt @@ -50,6 +51,13 @@ def test_tax_payable_gl(): for doc in sis: precision = frappe.get_precision(doc.doctype, "grand_total") doc.submit() + for row in doc.taxes: + if row.due_date != doc.posting_date: + due_date = get_due_date(doc.posting_date, row.party_type, row.party, doc.company) + assert row.due_date == due_date + else: + assert row.due_date == doc.posting_date + gl1 = frappe.get_doc( "GL Entry", {"voucher_no": doc.name, "account": "2320 - Sales Tax Payable - CFC"} ) From 8f76f2434675698710be2d3f058bcc259b767d69 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Tue, 18 Jun 2024 12:26:35 -0400 Subject: [PATCH 08/16] wip: tax payable due date --- check_run/tests/setup.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/check_run/tests/setup.py b/check_run/tests/setup.py index f4316552..4eae040c 100644 --- a/check_run/tests/setup.py +++ b/check_run/tests/setup.py @@ -285,6 +285,26 @@ def create_payment_terms_templates(settings): ) doc.save() + if not frappe.db.exists("Payment Terms Template", "Due After Month End"): + pt = frappe.new_doc("Payment Term") + pt.payment_term_name = "Due After Month End" + pt.due_date_based_on = "Day(s) after the end of the invoice month" + pt.invoice_portion = 100 + pt.credit_days = 28 + pt.save() + doc = frappe.new_doc("Payment Terms Template") + doc.template_name = pt.name + doc.append( + "terms", + { + "payment_term": pt.name, + "invoice_portion": pt.invoice_portion, + "due_date_based_on": pt.due_date_based_on, + "credit_days": pt.credit_days, + }, + ) + doc.save() + if not frappe.db.exists("Payment Terms Template", "2% 10 Net 30"): doc = frappe.new_doc("Payment Terms Template") doc.template_name = "2% 10 Net 30" From 1a63a9c46b0802da9778e1275c3c2a823afba393 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Tue, 24 Jun 2025 16:55:50 -0400 Subject: [PATCH 09/16] wip: setup --- check_run/tests/setup.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/check_run/tests/setup.py b/check_run/tests/setup.py index 4eae040c..f93b05ab 100644 --- a/check_run/tests/setup.py +++ b/check_run/tests/setup.py @@ -284,6 +284,25 @@ def create_payment_terms_templates(settings): }, ) doc.save() + if not frappe.db.exists("Payment Terms Template", "Due After Month End"): + pt = frappe.new_doc("Payment Term") + pt.payment_term_name = "Due After Month End" + pt.due_date_based_on = "Month(s) after the end of the invoice month" + pt.invoice_portion = 100 + pt.credit_days = 25 + pt.save() + doc = frappe.new_doc("Payment Terms Template") + doc.template_name = pt.name + doc.append( + "terms", + { + "payment_term": pt.name, + "invoice_portion": pt.invoice_portion, + "due_date_based_on": pt.due_date_based_on, + "credit_days": pt.credit_days, + }, + ) + doc.save() if not frappe.db.exists("Payment Terms Template", "Due After Month End"): pt = frappe.new_doc("Payment Term") @@ -451,6 +470,8 @@ def create_suppliers(settings): def create_items(settings): for supplier in suppliers + tax_authority: + if frappe.db.exists("Item", supplier[1]): + continue item = frappe.new_doc("Item") item.item_code = item.item_name = supplier[1] item.item_group = "Services" From a3ba966617a4bc4750434a52de8d264514fced3c Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Wed, 1 Apr 2026 10:48:35 -0400 Subject: [PATCH 10/16] feat/tests/docs: finalize tests for ST payable, add docs, improve link formatting --- .../check_run/doctype/check_run/check_run.py | 21 +- .../check_run_settings.json | 14 + check_run/overrides/payment_entry.py | 112 ++--- check_run/overrides/sales_invoice.py | 38 +- check_run/public/js/check_run/CheckRun.vue | 18 +- check_run/tests/fixtures.py | 42 +- check_run/tests/setup.py | 31 +- check_run/tests/test_tax_payable.py | 446 ++++++++++++++++-- docs/sales_tax_payable.md | 22 +- docs/settings.md | 6 +- 10 files changed, 634 insertions(+), 116 deletions(-) diff --git a/check_run/check_run/doctype/check_run/check_run.py b/check_run/check_run/doctype/check_run/check_run.py index 4b0abc74..7bb37344 100644 --- a/check_run/check_run/doctype/check_run/check_run.py +++ b/check_run/check_run/doctype/check_run/check_run.py @@ -142,6 +142,16 @@ def filter_transactions(self) -> None: @frappe.read_only() def not_outstanding_or_cancelled(self, transaction: dict) -> bool: + if transaction["doctype"] == "Sales Invoice": + # Tax payable: "name" is a Sales Taxes and Charges row, "ref_number" is the parent SI + si_docstatus = frappe.get_value("Sales Invoice", transaction.get("ref_number"), "docstatus") + if si_docstatus != 1: + return True + tax_outstanding = frappe.db.get_value( + "Sales Taxes and Charges", transaction["name"], "outstanding_amount" + ) + return flt(tax_outstanding) == 0.0 + filters = { "name": transaction["name"] if transaction["doctype"] != "Journal Entry" @@ -370,8 +380,11 @@ def create_payment_entries(self, transactions: list[frappe._dict]) -> list[frapp discount_amount, has_discount = calculate_payment_term_discount(reference, self.posting_date) total_discount_amount += discount_amount - if reference.doctype in ("Journal Entry", "Sales Invoice"): + if reference.doctype == "Journal Entry": reference_name = reference.ref_number + elif reference.doctype == "Sales Invoice": + # Tax payable: "name" is the Sales Taxes and Charges row name + reference_name = reference.name else: reference_name = reference.name or reference.ref_number @@ -831,7 +844,11 @@ def get_entries(doc: CheckRun | str) -> dict: .where(sales_invoice.docstatus == 1) .where(sales_taxes.account_head == pay_to_account) .where(sales_invoice.posting_date <= end_date) - .where(sales_taxes.outstanding_amount > 0.0) + .where( + sales_taxes.outstanding_amount > 0.0 + if settings and settings.allow_stand_alone_debit_notes == "No" + else sales_taxes.outstanding_amount != 0.0 + ) ) if not settings: 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 b5f8a3fc..bcb745d8 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 @@ -17,6 +17,7 @@ "include_purchase_invoices", "include_journal_entries", "include_expense_claims", + "include_tax_payable", "pre_check_overdue_items", "automatically_release_on_hold_invoices", "allow_cancellation", @@ -34,6 +35,7 @@ "journal_entry", "column_break_21", "expense_claim", + "tax_payable", "ach_settings_section", "allow_only_verified_accounts_in_nacha_generation", "ach_file_extension", @@ -89,6 +91,12 @@ "fieldtype": "Check", "label": "Include Expense Claims" }, + { + "default": "0", + "fieldname": "include_tax_payable", + "fieldtype": "Check", + "label": "Include Tax Payable from Sales Invoices" + }, { "default": "0", "description": "Payment Entries will be unlinked when Check Run is cancelled", @@ -225,6 +233,12 @@ "label": "Expense Claim", "options": "Mode of Payment" }, + { + "fieldname": "tax_payable", + "fieldtype": "Link", + "label": "Sales Tax Payable", + "options": "Mode of Payment" + }, { "fieldname": "column_break_27", "fieldtype": "Column Break" diff --git a/check_run/overrides/payment_entry.py b/check_run/overrides/payment_entry.py index 31226d65..f61c4e7b 100644 --- a/check_run/overrides/payment_entry.py +++ b/check_run/overrides/payment_entry.py @@ -270,69 +270,69 @@ def validate_allocated_amount_with_latest_data(self): ).format(frappe.bold(d.reference_name), frappe.bold(idx)) ) - # if no payment template is used by invoice and has a custom term(no `payment_term`), then invoice outstanding will be in 'None' key - latest = latest.get(d.payment_term) or latest.get(None) - # The reference has already been fully paid - if not latest: - frappe.throw( - _("{0} {1} has already been fully paid.").format(_(d.reference_doctype), d.reference_name) - ) - # The reference has already been partly paid - elif ( - latest.outstanding_amount < latest.invoice_amount - and flt(d.outstanding_amount, d.precision("outstanding_amount")) - != flt(latest.outstanding_amount, d.precision("outstanding_amount")) - and d.payment_term == "" - ): - frappe.throw( - _( - "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." - ).format(_(d.reference_doctype), d.reference_name) - ) - - fail_message = _( - "Row #{1} {0} / {2}: Allocated Amount of {3} cannot be greater than outstanding amount of {4}." + # if no payment template is used by invoice and has a custom term(no `payment_term`), then invoice outstanding will be in 'None' key + latest = latest.get(d.payment_term) or latest.get(None) + # The reference has already been fully paid + if not latest: + frappe.throw( + _("{0} {1} has already been fully paid.").format(_(d.reference_doctype), d.reference_name) + ) + # The reference has already been partly paid + elif ( + latest.outstanding_amount < latest.invoice_amount + and flt(d.outstanding_amount, d.precision("outstanding_amount")) + != flt(latest.outstanding_amount, d.precision("outstanding_amount")) + and d.payment_term == "" + ): + frappe.throw( + _( + "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." + ).format(_(d.reference_doctype), d.reference_name) ) - if ( - d.payment_term - and ( - (flt(d.allocated_amount)) > 0 - and latest.payment_term_outstanding - and (flt(d.allocated_amount) > flt(latest.payment_term_outstanding)) - ) - and self.term_based_allocation_enabled_for_reference(d.reference_doctype, d.reference_name) - ): - frappe.throw( - _( - "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}" - ).format( - d.idx, d.allocated_amount, latest.payment_term_outstanding, d.payment_term - ) + fail_message = _( + "Row #{1} {0} / {2}: Allocated Amount of {3} cannot be greater than outstanding amount of {4}." + ) + + if ( + d.payment_term + and ( + (flt(d.allocated_amount)) > 0 + and latest.payment_term_outstanding + and (flt(d.allocated_amount) > flt(latest.payment_term_outstanding)) + ) + and self.term_based_allocation_enabled_for_reference(d.reference_doctype, d.reference_name) + ): + frappe.throw( + _( + "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}" + ).format( + d.idx, d.allocated_amount, latest.payment_term_outstanding, d.payment_term ) + ) - if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(latest.outstanding_amount): - frappe.throw( - fail_message.format( - self.party_name, - d.idx, - get_link_to_form(d.reference_doctype, d.reference_name), - d.allocated_amount, - d.outstanding_amount, - ) + if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(latest.outstanding_amount): + frappe.throw( + fail_message.format( + self.party_name, + d.idx, + get_link_to_form(d.reference_doctype, d.reference_name), + d.allocated_amount, + d.outstanding_amount, ) + ) - # Check for negative outstanding invoices as well - if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(latest.outstanding_amount): - frappe.throw( - fail_message.format( - self.party_name, - d.idx, - get_link_to_form(d.reference_doctype, d.reference_name), - d.allocated_amount, - d.outstanding_amount, - ) + # Check for negative outstanding invoices as well + if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(latest.outstanding_amount): + frappe.throw( + fail_message.format( + self.party_name, + d.idx, + get_link_to_form(d.reference_doctype, d.reference_name), + d.allocated_amount, + d.outstanding_amount, ) + ) def make_gl_entries( diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index fd58c190..c7f9f49e 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -22,10 +22,36 @@ def validate(self): super().validate() def on_submit(self): - for row in self.taxes: - if row.party and row.party_type: - row.outstanding_amount = row.tax_amount - super().validate() + if self.is_return and self.return_against: + self._reduce_original_tax_outstanding() + super().on_submit() + + def _reduce_original_tax_outstanding(self): + for return_row in self.taxes: + if not (return_row.party and return_row.party_type): + continue + orig_row_name = frappe.db.get_value( + "Sales Taxes and Charges", + { + "parent": self.return_against, + "account_head": return_row.account_head, + "party": return_row.party, + }, + "name", + ) + if not orig_row_name: + continue + orig_outstanding = flt( + frappe.db.get_value("Sales Taxes and Charges", orig_row_name, "outstanding_amount") + ) + reduction = flt(abs(return_row.tax_amount)) + new_outstanding = flt(orig_outstanding - reduction, return_row.precision("tax_amount")) + frappe.db.set_value( + "Sales Taxes and Charges", + orig_row_name, + "outstanding_amount", + max(0.0, new_outstanding), + ) def make_tax_gl_entries(self, gl_entries): enable_discount_accounting = cint( @@ -40,7 +66,7 @@ def make_tax_gl_entries(self, gl_entries): is_payable_account = bool( frappe.get_value("Account", tax.account_head, "account_type") == "Payable" ) - dimensions = {d: tax.get(d) for d in accounting_dimensions} + dimensions = {d: tax.get(d) for d in accounting_dimensions if d != "cost_center"} gl_entries.append( self.get_gl_dict( { @@ -60,4 +86,4 @@ def make_tax_gl_entries(self, gl_entries): account_currency, item=tax, ) - ) + ) diff --git a/check_run/public/js/check_run/CheckRun.vue b/check_run/public/js/check_run/CheckRun.vue index 6724b944..bcc061a5 100644 --- a/check_run/public/js/check_run/CheckRun.vue +++ b/check_run/public/js/check_run/CheckRun.vue @@ -106,7 +106,7 @@ {{ item.party_name || item.party }} - {{ item.doctype != 'Sales Invoice' ? item.ref_number : item.name }} + {{ item.ref_number }}
0.0, "Outstanding should be positive after SI submission" + + return_si = make_return_doc("Sales Invoice", si.name) + return_si.posting_date = frappe.utils.add_days(si.posting_date, 1) + return_si.save() + return_si.submit() + + reduced_outstanding = flt( + frappe.db.get_value("Sales Taxes and Charges", ma_tax_row.name, "outstanding_amount") + ) + assert ( + reduced_outstanding == 0.0 + ), f"Outstanding should be 0 after full return, got {reduced_outstanding}" + + +@pytest.mark.order(50) +def test_return_after_payable_remitted(): + """ + Verify that creating a return SI after the tax payable has already been + remitted via Payment Entry correctly: + - leaves the original SI's outstanding_amount at 0 (already paid, stays 0) + - sets the return SI's tax row outstanding_amount to a negative value + (representing the credit owed back from the tax authority) + + Timeline: + 1. Submit SI → outstanding_amount = tax_amount + 2. Submit Payment Entry → outstanding_amount = 0 + 3. Submit return SI → original outstanding stays 0, return row outstanding = -tax_amount + """ + si = frappe.new_doc("Sales Invoice") + si.customer = "Cafe 27 Cafeteria" + si.set_posting_time = 1 + si.company = "Chelsea Fruit Co" + si.posting_date = getdate().replace(month=7, day=1) + si.append("items", {"item_code": "Cloudberry", "qty": 10, "rate": 1.30}) + si.taxes_and_charges = "MA Sales Tax - CFC" + taxes = frappe.call( + "erpnext.controllers.accounts_controller.get_taxes_and_charges", + master_doctype="Sales Taxes and Charges Template", + master_name="MA Sales Tax - CFC", + ) + for tax in taxes: + si.append("taxes", tax) + si.save() + si.submit() + + ma_tax_row = next(row for row in si.taxes if row.party == "Massachusetts Department of Revenue") + tax_row_name = ma_tax_row.name + tax_amount = flt(ma_tax_row.tax_amount) + + gl_account = frappe.get_value( + "Account", + {"account_type": "Bank", "company": "Chelsea Fruit Co", "is_group": 0}, + ) + pe = frappe.new_doc("Payment Entry") + pe.payment_type = "Pay" + pe.posting_date = getdate().replace(month=7, day=25) + pe.mode_of_payment = "Check" + pe.company = "Chelsea Fruit Co" + pe.bank_account = "Primary Checking - Local Bank" + pe.paid_from = gl_account + pe.paid_to = "2320 - Sales Tax Payable - CFC" + pe.paid_to_account_currency = frappe.db.get_value("Account", gl_account, "account_currency") + pe.paid_from_account_currency = pe.paid_to_account_currency + pe.reference_no = "Test-Tax-Return-After-Paid" + pe.reference_date = pe.posting_date + pe.party_type = "Supplier" + pe.party = "Massachusetts Department of Revenue" + pe.paid_amount = tax_amount + pe.received_amount = tax_amount + pe.base_paid_amount = tax_amount + pe.base_received_amount = tax_amount + pe.base_grand_total = tax_amount + pe.append( + "references", + { + "reference_doctype": "Sales Taxes and Charges", + "reference_name": tax_row_name, + "due_date": ma_tax_row.due_date, + "total_amount": tax_amount, + "outstanding_amount": tax_amount, + "allocated_amount": tax_amount, + }, + ) + pe.save() + pe.submit() + + outstanding_after_payment = flt( + frappe.db.get_value("Sales Taxes and Charges", tax_row_name, "outstanding_amount") + ) + assert outstanding_after_payment == 0.0, "Outstanding should be 0 after payment" + + return_si = make_return_doc("Sales Invoice", si.name) + return_si.posting_date = frappe.utils.add_days(si.posting_date, 1) + return_si.save() + return_si.submit() + + return_ma_tax_row = next( + (row for row in return_si.taxes if row.party == "Massachusetts Department of Revenue"), + None, + ) + assert return_ma_tax_row, "Return SI should have a Massachusetts Department of Revenue tax row" + return_outstanding = flt( + frappe.db.get_value("Sales Taxes and Charges", return_ma_tax_row.name, "outstanding_amount") + ) + assert ( + return_outstanding < 0.0 + ), f"Return SI tax row outstanding should be negative, got {return_outstanding}" + assert flt(abs(return_outstanding), 2) == flt(tax_amount, 2), ( + f"Return outstanding magnitude {abs(return_outstanding)} should equal " + f"original tax amount {tax_amount}" + ) + + original_outstanding_unchanged = flt( + frappe.db.get_value("Sales Taxes and Charges", tax_row_name, "outstanding_amount") + ) + assert ( + original_outstanding_unchanged == 0.0 + ), "Original outstanding should remain 0 after the return (it was already paid)" + + +@pytest.mark.order(55) +def test_reversed_payable_in_check_run(): + """ + Verify that a return SI's negative outstanding tax row (created by + test_return_after_payable_remitted) surfaces in get_entries for the + Sales Tax Payable Check Run, allowing the credit to be reconciled. + + The outstanding_amount != 0 filter in the st_qb query must include + negative values so that returns-after-payment appear for review. + """ + cr_name = check_for_draft_check_run( + company="Chelsea Fruit Co", + bank_account="Primary Checking - Local Bank", + payable_account="2320 - Sales Tax Payable - CFC", + ) + cr = frappe.get_doc("Check Run", cr_name) + cr.flags.in_test = True + cr.posting_date = cr.end_date = datetime.date(year, 12, 31) + cr.set_last_check_number() + cr.save() + crs = get_check_run_settings(cr) + crs.include_tax_payable = 1 + crs.allow_stand_alone_debit_notes = "Yes" + crs.number_of_invoices_per_voucher = 100 + crs.save() + + entries = get_entries(cr) + transactions = entries.get("transactions") + + negative_transactions = [t for t in transactions if flt(t.get("amount", 0)) < 0.0] + assert ( + negative_transactions + ), "Expected at least one negative tax payable entry from the return SI created in test 50" + for t in negative_transactions: assert t.get("doctype") == "Sales Invoice" assert t.get("party") == "Massachusetts Department of Revenue" - cr.process_check_run() + + +@pytest.mark.order(60) +def test_multiple_tax_authorities_single_invoice(): + """ + Verify that an SI with tax rows pointing to two different tax authorities + produces separate GL entries for each and appears as two independent rows + in the Check Run. + + | Account | Debit | Credit | Party | + | ----------------------- | --------:| --------:| ----------------------------------- | + | Accounts Receivable | $150.75 | | Beans and Dreams Roasters | + | Sales | | $130.00 | | + | 2320 Sales Tax Payable | | $8.13 | Massachusetts Department of Revenue | + | 2320 Sales Tax Payable | | $7.80 | Vermont Department of Taxes | + + Two GL entries against the same account but different parties; two separate + rows in the Check Run allowing independent payment to each authority. + """ + si = frappe.new_doc("Sales Invoice") + si.customer = "Beans and Dreams Roasters" + si.set_posting_time = 1 + si.company = "Chelsea Fruit Co" + si.posting_date = getdate().replace(month=8, day=1) + si.append("items", {"item_code": "Cloudberry", "qty": 100, "rate": 1.30}) + + for template_name in ("MA Sales Tax - CFC", "VT Sales Tax - CFC"): + taxes = frappe.call( + "erpnext.controllers.accounts_controller.get_taxes_and_charges", + master_doctype="Sales Taxes and Charges Template", + master_name=template_name, + ) + for tax in taxes: + si.append("taxes", tax) + + si.save() + si.submit() + + gl_entries = frappe.get_all( + "GL Entry", + {"voucher_no": si.name, "account": "2320 - Sales Tax Payable - CFC", "is_cancelled": 0}, + ["name", "credit", "party"], + ) + assert ( + len(gl_entries) == 2 + ), f"Expected 2 GL entries for tax payable (one per authority), got {len(gl_entries)}" + parties = {g.party for g in gl_entries} + assert "Massachusetts Department of Revenue" in parties + assert "Vermont Department of Taxes" in parties + + cr_name = check_for_draft_check_run( + company="Chelsea Fruit Co", + bank_account="Primary Checking - Local Bank", + payable_account="2320 - Sales Tax Payable - CFC", + ) + cr = frappe.get_doc("Check Run", cr_name) + cr.flags.in_test = True + cr.posting_date = cr.end_date = datetime.date(year, 12, 31) + cr.set_last_check_number() + cr.save() + crs = get_check_run_settings(cr) + crs.include_tax_payable = 1 + crs.number_of_invoices_per_voucher = 100 + crs.save() entries = get_entries(cr) transactions = entries.get("transactions") - pe_name = transactions[0].get("payment_entry") - assert all([pe_name == t.get("payment_entry") for t in transactions]) + + ma_entries = [t for t in transactions if t.get("party") == "Massachusetts Department of Revenue"] + vt_entries = [t for t in transactions if t.get("party") == "Vermont Department of Taxes"] + assert ma_entries, "Massachusetts Department of Revenue should appear in Check Run entries" + assert vt_entries, "Vermont Department of Taxes should appear in Check Run entries" + + this_si_ma = [t for t in ma_entries if t.get("ref_number") == si.name] + this_si_vt = [t for t in vt_entries if t.get("ref_number") == si.name] + assert ( + this_si_ma + ), f"SI {si.name} should appear in Check Run for Massachusetts Department of Revenue" + assert this_si_vt, f"SI {si.name} should appear in Check Run for Vermont Department of Taxes" + + +@pytest.mark.order(70) +def test_accounting_dimensions_in_tax_gl_entries(): + """ + Verify that the cost_center from the Sales Taxes and Charges row flows + through to the GL Entry created for the tax payable account. Also verifies + that any custom accounting dimensions defined in the system are passed + through from the tax row to the GL entry. + + | Account | Debit | Credit | Cost Center | Party | + | ---------------------- | --------:| --------:| ----------- | ----------------------------------- | + | 2320 Sales Tax Payable | | $0.81 | Main - CFC | Massachusetts Department of Revenue | + """ + from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( + get_accounting_dimensions, + ) + + si = frappe.new_doc("Sales Invoice") + si.customer = "Capital Grille Restaurant Group" + si.set_posting_time = 1 + si.company = "Chelsea Fruit Co" + si.posting_date = getdate().replace(month=9, day=1) + si.append("items", {"item_code": "Cloudberry", "qty": 10, "rate": 1.30}) + si.taxes_and_charges = "MA Sales Tax - CFC" + taxes = frappe.call( + "erpnext.controllers.accounts_controller.get_taxes_and_charges", + master_doctype="Sales Taxes and Charges Template", + master_name="MA Sales Tax - CFC", + ) + for tax in taxes: + si.append("taxes", tax) + si.save() + si.submit() + + tax_row = next(row for row in si.taxes if row.party == "Massachusetts Department of Revenue") + gl_entry = frappe.get_doc( + "GL Entry", + { + "voucher_no": si.name, + "account": "2320 - Sales Tax Payable - CFC", + "is_cancelled": 0, + }, + ) + assert gl_entry.cost_center == tax_row.cost_center, ( + f"GL Entry cost_center '{gl_entry.cost_center}' should match " + f"tax row cost_center '{tax_row.cost_center}'" + ) + assert gl_entry.cost_center, "cost_center should not be empty on tax GL entry" + + for dimension in get_accounting_dimensions(): + expected = tax_row.get(dimension) + actual = gl_entry.get(dimension) + assert actual == expected, ( + f"Accounting dimension '{dimension}': GL Entry has '{actual}', " f"tax row has '{expected}'" + ) diff --git a/docs/sales_tax_payable.md b/docs/sales_tax_payable.md index fd8882e8..362be8e2 100644 --- a/docs/sales_tax_payable.md +++ b/docs/sales_tax_payable.md @@ -3,6 +3,26 @@ For license information, please see license.txt--> # Sales Tax Payable +
+ Tyler Matteson 2024-04-01 +
+ + By noting the Party Type and Party in the Sales Taxes and Charges table of a Sales Invoice, the user can opt to record the Sales Tax as payable and note the party. An Outstanding Amount will be created on submit to track which rows have been satisfied. -In Check Run Settings, set the "Include Tax Payable from Sales Invoices" create a Check Run with these options. Given the large number of rows that may be included in a given period, enabling the secondary print format feature is recommended. \ No newline at end of file +In Check Run Settings, set the "Include Tax Payable from Sales Invoices" to create a Check Run with these options. Given the large number of rows that may be included in a given period, enabling the secondary print format feature is recommended. + +## Recommended Settings for the Sales Tax Payable Check Run + +When creating Check Run Settings for the bank account / Sales Tax Payable account combination, set **Allow stand-alone debit notes?** to **Yes**. + +Sales invoice returns create a negative outstanding amount on the corresponding Sales Taxes and Charges row. With this setting enabled, those credit rows appear in the Check Run so the credit can be remitted or netted against future tax payments to the same authority. With the default value of **No**, only positive outstanding amounts are shown and credits from returns will not surface for reconciliation. + +## Returns After Tax Has Been Remitted + +When a sales invoice is returned after the tax liability has already been paid via a Check Run: + +- The original invoice's tax row outstanding amount remains `0` (it was already remitted). +- The return invoice's tax row carries a **negative** outstanding amount equal to the original tax, representing the credit owed back from the tax authority. + +This credit row will appear in the next Check Run (with **Allow stand-alone debit notes?** set to **Yes**), where it can be selected to net against other tax remittances or processed as a standalone refund. \ No newline at end of file diff --git a/docs/settings.md b/docs/settings.md index 15f16406..f154ea56 100644 --- a/docs/settings.md +++ b/docs/settings.md @@ -4,7 +4,7 @@ For license information, please see license.txt--> # Check Run Settings
- Tyler Matteson 2026-02-21 + Heather Kusmierz, Tyler Matteson, and Francisco Roldán 2026-02-23
@@ -56,6 +56,10 @@ graph TD - This setting is an upper limit for the number of invoices per party to group into each voucher to that party - The screen shot below shows the output of a submitted Check Run where the Number of Invoices per Voucher setting was set to 2. Out of the four invoices paid to Exceptional Grid, they are grouped so two are paid under one voucher, then the other two are paid under a different voucher - This can also be set per-Supplier in the "Number of Invoices Per Check Voucher" field. Per-supplier configuration overrides the number in Check Run Settings +- **Allow stand-alone debit notes?** + - Default is **No** + - When set to **No**, only items with a positive outstanding amount appear in the Check Run. Debit notes (purchase invoice returns) and tax credit rows from sales invoice returns are excluded unless they are being netted against a positive invoice for the same party in the same run. + - When set to **Yes**, items with any non-zero outstanding amount — positive or negative — are included. This is the recommended setting for any Check Run whose payable account is a Sales Tax Payable account, so that credits arising from sales invoice returns are available for remittance or netting against future tax payments. See the [Sales Tax Payable](./sales_tax_payable.md) page for details. - **Secondary Print Format:** - Allows for payments with more than the configured split number to cascade onto a separate print format that details that all the linked documents. - **Split Invoices By Address:** From 4fcb95619bc4979966a115654a2b3f7e8d12e39f Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Wed, 1 Apr 2026 12:20:46 -0400 Subject: [PATCH 11/16] feat: remittance report, docs and tests --- .github/workflows/pytest.yaml | 10 +- .../check_run/doctype/check_run/check_run.py | 43 +- .../doctype/check_run/test_check_run.py | 8 - .../check_run_settings/check_run_settings.py | 49 + .../test_check_run_settings.py | 9 - .../report/sales_tax_remittance/__init__.py | 2 + .../sales_tax_remittance.js | 58 + .../sales_tax_remittance.json | 29 + .../sales_tax_remittance.py | 337 +++++ check_run/overrides/sales_invoice.py | 18 + .../check_run_settings_quick_entry.js | 17 + check_run/public/js/vite.config.js | 5 - check_run/tests/setup.py | 19 - check_run/tests/test_sales_tax_remittance.py | 416 ++++++ docs/index.md | 3 +- docs/sales_tax_remittance_report.md | 25 + pyproject.toml | 2 +- yarn.lock | 1161 +++++++++-------- 18 files changed, 1587 insertions(+), 624 deletions(-) delete mode 100644 check_run/check_run/doctype/check_run/test_check_run.py delete mode 100644 check_run/check_run/doctype/check_run_settings/test_check_run_settings.py create mode 100644 check_run/check_run/report/sales_tax_remittance/__init__.py create mode 100644 check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.js create mode 100644 check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.json create mode 100644 check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.py create mode 100644 check_run/tests/test_sales_tax_remittance.py create mode 100644 docs/sales_tax_remittance_report.md diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 901d7ca9..33a06394 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -85,4 +85,12 @@ jobs: working-directory: /home/runner/frappe-bench run: | source env/bin/activate - pytest ./apps/check_run/check_run/tests/ --disable-warnings -s + cd apps/check_run + poetry install + pytest check_run/tests/ --disable-warnings -s | tee pytest-coverage.txt + + - name: Pytest coverage comment + uses: MishaKav/pytest-coverage-comment@main + with: + pytest-coverage-path: /home/runner/frappe-bench/apps/check_run/pytest-coverage.txt + pytest-xml-coverage-path: /home/runner/frappe-bench/apps/check_run/coverage.xml diff --git a/check_run/check_run/doctype/check_run/check_run.py b/check_run/check_run/doctype/check_run/check_run.py index 7bb37344..624ac42e 100644 --- a/check_run/check_run/doctype/check_run/check_run.py +++ b/check_run/check_run/doctype/check_run/check_run.py @@ -32,6 +32,41 @@ class CheckRun(Document): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + ach_file_generated: DF.Check + amended_from: DF.Link | None + amount_check_run: DF.Currency + bank_account: DF.Link + beg_balance: DF.Currency + company: DF.Link + company_discretionary_data: DF.Data | None + end_date: DF.Date | None + final_check_number: DF.Int + initial_check_number: DF.Int + pay_to_account: DF.Link + posting_date: DF.Date | None + print_count: DF.Int + status: DF.Literal[ + "Draft", + "Pending Approval", + "Approved", + "Submitting", + "Submitted", + "Ready to Print", + "Confirm Print", + "Printed", + ] + transactions: DF.LongText | None + + # end: auto-generated types + @frappe.read_only() def onload(self) -> None: if self.is_new(): @@ -201,7 +236,7 @@ def process_check_run(self) -> None: self.filter_transactions() transactions = [ t - for t in json.loads(self.transactions) + for t in json.loads(self.transactions or "[]") if t.get("pay") and not self.not_outstanding_or_cancelled(t) ] if not len(transactions): @@ -224,7 +259,7 @@ def _process_check_run(self, save: bool = False) -> None: frappe.db.sql("SAVEPOINT process_check_run") # sql:ignore try: __transactions = self.transactions - _transactions = json.loads(__transactions) + _transactions = json.loads(__transactions or "[]") transactions = sorted( (frappe._dict(item) for item in _transactions if item.get("pay")), key=lambda x: x.party ) @@ -252,7 +287,7 @@ def build_nacha_file(self, settings: CheckRunSettings) -> str: ach_payment_entries = list( { e.get("payment_entry") - for e in json.loads(self.transactions) + for e in json.loads(self.transactions or "[]") if e.get("mode_of_payment") in electronic_mop } ) @@ -478,7 +513,7 @@ def render_check_pdf(self, reprint_check_number: int | None = None) -> None: if reprint_check_number and reprint_check_number != "undefined": self.initial_check_number = int(reprint_check_number) output = PdfWriter() - transactions = json.loads(self.transactions) + transactions = json.loads(self.transactions or "[]") check_increment = 0 _transactions = [] idx = 0 diff --git a/check_run/check_run/doctype/check_run/test_check_run.py b/check_run/check_run/doctype/check_run/test_check_run.py deleted file mode 100644 index b285a8f7..00000000 --- a/check_run/check_run/doctype/check_run/test_check_run.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022, AgriTheory and Contributors -# See license.txt - -import unittest - - -class TestCheckRun(unittest.TestCase): - pass diff --git a/check_run/check_run/doctype/check_run_settings/check_run_settings.py b/check_run/check_run/doctype/check_run_settings/check_run_settings.py index 57276694..ded45646 100644 --- a/check_run/check_run/doctype/check_run_settings/check_run_settings.py +++ b/check_run/check_run/doctype/check_run_settings/check_run_settings.py @@ -6,6 +6,55 @@ class CheckRunSettings(Document): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + ach_description: DF.Data | None + ach_file_extension: DF.Data | None + ach_service_class_code: DF.Literal["200", "220", "225"] + ach_standard_class_code: DF.Literal["PPD"] + allow_cancellation: DF.Check + allow_only_verified_accounts_in_nacha_generation: DF.Check + allow_stand_alone_debit_notes: DF.Literal["Yes", "No"] + approver_role: DF.Link | None + attach_positive_pay: DF.Check + automatically_release_on_hold_invoices: DF.Check + bank_account: DF.Link + cascade_cancellation: DF.Check + company: DF.Link + company_discretionary_data: DF.Data | None + csv_delimiter: DF.Data | None + csv_quoting: DF.Literal["Minimal", "All", "Non-numeric", "None"] + custom_post_processing_hook: DF.Data | None + expense_claim: DF.Link | None + file_preview_threshold: DF.Int + immediate_origin: DF.Data | None + include_expense_claims: DF.Check + include_journal_entries: DF.Check + include_purchase_invoices: DF.Check + include_tax_payable: DF.Check + journal_entry: DF.Link | None + number_of_invoices_per_voucher: DF.Int + pay_to_account: DF.Link + payment_discount_account: DF.Link | None + positive_pay_file_format: DF.Literal["CSV", "Excel"] + pre_check_overdue_items: DF.Check + print_format: DF.Link | None + purchase_invoice: DF.Link | None + role_allowed_to_download_ach_file_multiple_times: DF.Link | None + set_payment_entry_posting_date: DF.Literal["Use Today's Date", "Use Check Run's Posting Date"] + show_due_date: DF.Literal["Show Due Date", "Show Days Past Due"] + split_by_address: DF.Check + tax_payable: DF.Link | None + validate_unique_check_number: DF.Check + + # end: auto-generated types + pass diff --git a/check_run/check_run/doctype/check_run_settings/test_check_run_settings.py b/check_run/check_run/doctype/check_run_settings/test_check_run_settings.py deleted file mode 100644 index 29996e55..00000000 --- a/check_run/check_run/doctype/check_run_settings/test_check_run_settings.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022, AgriTheory and Contributors -# See license.txt - -# import frappe -import unittest - - -class TestCheckRunSettings(unittest.TestCase): - pass diff --git a/check_run/check_run/report/sales_tax_remittance/__init__.py b/check_run/check_run/report/sales_tax_remittance/__init__.py new file mode 100644 index 00000000..ea2ab3f3 --- /dev/null +++ b/check_run/check_run/report/sales_tax_remittance/__init__.py @@ -0,0 +1,2 @@ +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt diff --git a/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.js b/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.js new file mode 100644 index 00000000..80d41553 --- /dev/null +++ b/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.js @@ -0,0 +1,58 @@ +// Copyright (c) 2026, AgriTheory and contributors +// For license information, please see license.txt +/* eslint-disable */ + +frappe.query_reports['Sales Tax Remittance'] = { + filters: [ + { + fieldname: 'company', + label: __('Company'), + fieldtype: 'Link', + options: 'Company', + default: frappe.defaults.get_user_default('Company'), + reqd: 1, + }, + { + fieldname: 'to_date', + label: __('Up To Date'), + fieldtype: 'Date', + default: frappe.datetime.get_today(), + reqd: 1, + }, + { + fieldname: 'tax_authority', + label: __('Tax Authority'), + fieldtype: 'Link', + options: 'Supplier', + }, + { + fieldname: 'tax_account', + label: __('Tax Account'), + fieldtype: 'Link', + options: 'Account', + get_query: () => { + const company = frappe.query_report.get_filter_value('company') + return { + filters: { + account_type: 'Tax', + company: company, + is_group: 0, + }, + } + }, + }, + { + fieldname: 'remittance_status', + label: __('Remittance Status'), + fieldtype: 'Select', + options: '\nAll\nOutstanding\nRemitted', + default: 'All', + }, + { + fieldname: 'show_detail', + label: __('Show Detail'), + fieldtype: 'Check', + default: 0, + }, + ], +} diff --git a/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.json b/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.json new file mode 100644 index 00000000..f6c0531a --- /dev/null +++ b/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.json @@ -0,0 +1,29 @@ +{ + "add_total_row": 1, + "columns": [], + "creation": "2026-04-01 00:00:00.000000", + "disable_prepared_report": 0, + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "filters": [], + "idx": 0, + "is_standard": "Yes", + "modified": "2026-04-01 00:00:00.000000", + "modified_by": "Administrator", + "module": "Check Run", + "name": "Sales Tax Remittance", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "Sales Invoice", + "report_name": "Sales Tax Remittance", + "report_type": "Script Report", + "roles": [ + { + "role": "Accounts User" + }, + { + "role": "Accounts Manager" + } + ] +} diff --git a/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.py b/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.py new file mode 100644 index 00000000..8fb3a9ff --- /dev/null +++ b/check_run/check_run/report/sales_tax_remittance/sales_tax_remittance.py @@ -0,0 +1,337 @@ +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt + +from collections import defaultdict + +import frappe +from frappe import _ +from frappe.query_builder.functions import Coalesce +from frappe.utils import flt + + +def execute(filters=None): + filters = frappe._dict(filters or {}) + return get_columns(filters), get_data(filters) + + +def get_columns(filters): + if filters.get("show_detail"): + return [ + { + "label": _("Tax Authority"), + "fieldname": "party", + "fieldtype": "Link", + "options": "Supplier", + "width": 200, + }, + { + "label": _("Sales Invoice"), + "fieldname": "sales_invoice", + "fieldtype": "Link", + "options": "Sales Invoice", + "width": 160, + }, + { + "label": _("Customer"), + "fieldname": "customer", + "fieldtype": "Link", + "options": "Customer", + "width": 160, + }, + { + "label": _("Invoice Date"), + "fieldname": "posting_date", + "fieldtype": "Date", + "width": 110, + }, + { + "label": _("Due Date"), + "fieldname": "due_date", + "fieldtype": "Date", + "width": 110, + }, + { + "label": _("Tax Account"), + "fieldname": "account_head", + "fieldtype": "Link", + "options": "Account", + "width": 200, + }, + { + "label": _("Rate %"), + "fieldname": "rate", + "fieldtype": "Percent", + "width": 80, + }, + { + "label": _("Tax Amount (Accrual)"), + "fieldname": "tax_amount", + "fieldtype": "Currency", + "width": 150, + }, + { + "label": _("Customer Paid"), + "fieldname": "customer_paid", + "fieldtype": "Check", + "width": 110, + }, + { + "label": _("Amount Remitted"), + "fieldname": "amount_remitted", + "fieldtype": "Currency", + "width": 140, + }, + { + "label": _("Outstanding"), + "fieldname": "outstanding_amount", + "fieldtype": "Currency", + "width": 120, + }, + { + "label": _("Remittance Date"), + "fieldname": "remittance_date", + "fieldtype": "Date", + "width": 130, + }, + { + "label": _("Remittance Voucher"), + "fieldname": "remittance_voucher", + "fieldtype": "Link", + "options": "Payment Entry", + "width": 170, + }, + ] + else: + return [ + { + "label": _("Tax Authority"), + "fieldname": "party", + "fieldtype": "Link", + "options": "Supplier", + "width": 200, + }, + { + "label": _("Period"), + "fieldname": "period", + "fieldtype": "Data", + "width": 90, + }, + { + "label": _("Tax Account"), + "fieldname": "account_head", + "fieldtype": "Link", + "options": "Account", + "width": 200, + }, + { + "label": _("Total Collected (Accrual)"), + "fieldname": "total_collected", + "fieldtype": "Currency", + "width": 180, + }, + { + "label": _("Customer-Paid Amount"), + "fieldname": "customer_paid_amount", + "fieldtype": "Currency", + "width": 170, + }, + { + "label": _("Total Remitted"), + "fieldname": "total_remitted", + "fieldtype": "Currency", + "width": 140, + }, + { + "label": _("Total Outstanding"), + "fieldname": "total_outstanding", + "fieldtype": "Currency", + "width": 150, + }, + ] + + +def get_data(filters): + if filters.get("show_detail"): + return get_detail_data(filters) + return get_summary_data(filters) + + +def get_detail_data(filters): + stc = frappe.qb.DocType("Sales Taxes and Charges") + si = frappe.qb.DocType("Sales Invoice") + + rows = ( + frappe.qb.from_(stc) + .inner_join(si) + .on(stc.parent == si.name) + .select( + stc.party, + stc.parent.as_("sales_invoice"), + si.customer, + si.posting_date, + Coalesce(stc.due_date, si.posting_date).as_("due_date"), + stc.account_head, + stc.rate, + stc.tax_amount_after_discount_amount.as_("tax_amount"), + stc.outstanding_amount, + stc.name.as_("stc_name"), + si.outstanding_amount.as_("si_outstanding"), + ) + .where(si.company == filters.company) + .where(si.docstatus == 1) + .where(stc.party.isnotnull()) + .where(stc.party != "") + ) + + if filters.get("to_date"): + rows = rows.where(si.posting_date <= filters.to_date) + if filters.get("tax_authority"): + rows = rows.where(stc.party == filters.tax_authority) + if filters.get("tax_account"): + rows = rows.where(stc.account_head == filters.tax_account) + + rows = rows.orderby(stc.party).orderby(si.posting_date).orderby(stc.parent).run(as_dict=True) + + # Fetch remittance totals in one query to avoid N+1 + stc_names = [r.stc_name for r in rows] + remittance_map = {} + if stc_names: + rem_rows = frappe.db.sql( + """ + SELECT + per.reference_name AS stc_name, + SUM(per.allocated_amount) AS total_allocated, + MAX(pe.posting_date) AS last_remittance_date, + ( + SELECT pe2.name + FROM `tabPayment Entry` pe2 + JOIN `tabPayment Entry Reference` per2 ON per2.parent = pe2.name + WHERE per2.reference_doctype = 'Sales Taxes and Charges' + AND per2.reference_name = per.reference_name + AND pe2.docstatus = 1 + ORDER BY pe2.posting_date DESC + LIMIT 1 + ) AS last_voucher + FROM `tabPayment Entry Reference` per + JOIN `tabPayment Entry` pe ON per.parent = pe.name + WHERE per.reference_doctype = 'Sales Taxes and Charges' + AND per.reference_name IN %(stc_names)s + AND pe.docstatus = 1 + GROUP BY per.reference_name + """, + {"stc_names": stc_names}, + as_dict=True, + ) + for rem in rem_rows: + remittance_map[rem.stc_name] = rem + + output = [] + for row in rows: + rem = remittance_map.get(row.stc_name, frappe._dict()) + amount_remitted = flt(rem.get("total_allocated", 0)) + + # Remittance status filter + status = filters.get("remittance_status") + if status == "Outstanding" and flt(row.outstanding_amount) <= 0: + continue + if status == "Remitted" and flt(row.outstanding_amount) > 0: + continue + + output.append( + { + "party": row.party, + "sales_invoice": row.sales_invoice, + "customer": row.customer, + "posting_date": row.posting_date, + "due_date": row.due_date, + "account_head": row.account_head, + "rate": row.rate, + "tax_amount": row.tax_amount, + "customer_paid": 1 if flt(row.si_outstanding) == 0.0 else 0, + "amount_remitted": amount_remitted, + "outstanding_amount": row.outstanding_amount, + "remittance_date": rem.get("last_remittance_date"), + "remittance_voucher": rem.get("last_voucher"), + } + ) + + return output + + +def get_summary_data(filters): + stc = frappe.qb.DocType("Sales Taxes and Charges") + si = frappe.qb.DocType("Sales Invoice") + + rows = ( + frappe.qb.from_(stc) + .inner_join(si) + .on(stc.parent == si.name) + .select( + stc.party, + stc.account_head, + stc.tax_amount_after_discount_amount.as_("tax_amount"), + stc.outstanding_amount, + si.posting_date, + si.outstanding_amount.as_("si_outstanding"), + ) + .where(si.company == filters.company) + .where(si.docstatus == 1) + .where(stc.party.isnotnull()) + .where(stc.party != "") + ) + + if filters.get("to_date"): + rows = rows.where(si.posting_date <= filters.to_date) + if filters.get("tax_authority"): + rows = rows.where(stc.party == filters.tax_authority) + if filters.get("tax_account"): + rows = rows.where(stc.account_head == filters.tax_account) + + rows = rows.run(as_dict=True) + + # Aggregate in Python — grouping by (party, account_head, YYYY-MM) + buckets = defaultdict( + lambda: { + "total_collected": 0.0, + "customer_paid_amount": 0.0, + "total_remitted": 0.0, + "total_outstanding": 0.0, + } + ) + + for row in rows: + period = row.posting_date.strftime("%Y-%m") if row.posting_date else "" + key = (row.party, period, row.account_head) + b = buckets[key] + tax = flt(row.tax_amount) + outstanding = flt(row.outstanding_amount) + remitted = flt(tax - outstanding) + + b["total_collected"] += tax + b["total_outstanding"] += outstanding + b["total_remitted"] += remitted + if flt(row.si_outstanding) == 0.0: + b["customer_paid_amount"] += tax + + # Apply remittance status filter and build output + status = filters.get("remittance_status") + output = [] + for (party, period, account_head), b in sorted(buckets.items()): + if status == "Outstanding" and flt(b["total_outstanding"]) <= 0: + continue + if status == "Remitted" and flt(b["total_outstanding"]) > 0: + continue + + output.append( + { + "party": party, + "period": period, + "account_head": account_head, + "total_collected": flt(b["total_collected"], 2), + "customer_paid_amount": flt(b["customer_paid_amount"], 2), + "total_remitted": flt(b["total_remitted"], 2), + "total_outstanding": flt(b["total_outstanding"], 2), + } + ) + + return output diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index c7f9f49e..b3a0c8d0 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -13,6 +13,12 @@ class CheckRunSalesInvoice(SalesInvoice): def validate(self): + """ + HASH: f8ab56ecc96ae7c28b9f7b8e79488ff2c47cc810 + REPO: https://github.com/frappe/erpnext/ + PATH: erpnext/accounts/doctype/sales_invoice/sales_invoice.py + METHOD: validate + """ for row in self.taxes: if not row.party: continue @@ -22,6 +28,12 @@ def validate(self): super().validate() def on_submit(self): + """ + HASH: f8ab56ecc96ae7c28b9f7b8e79488ff2c47cc810 + REPO: https://github.com/frappe/erpnext/ + PATH: erpnext/accounts/doctype/sales_invoice/sales_invoice.py + METHOD: on_submit + """ if self.is_return and self.return_against: self._reduce_original_tax_outstanding() super().on_submit() @@ -54,6 +66,12 @@ def _reduce_original_tax_outstanding(self): ) def make_tax_gl_entries(self, gl_entries): + """ + HASH: f8ab56ecc96ae7c28b9f7b8e79488ff2c47cc810 + REPO: https://github.com/frappe/erpnext/ + PATH: erpnext/accounts/doctype/sales_invoice/sales_invoice.py + METHOD: make_tax_gl_entries + """ enable_discount_accounting = cint( frappe.db.get_single_value("Selling Settings", "enable_discount_accounting") ) diff --git a/check_run/public/js/check_run/check_run_settings_quick_entry.js b/check_run/public/js/check_run/check_run_settings_quick_entry.js index 1bcc6061..2b175ef4 100644 --- a/check_run/public/js/check_run/check_run_settings_quick_entry.js +++ b/check_run/public/js/check_run/check_run_settings_quick_entry.js @@ -79,4 +79,21 @@ frappe.ui.form.CheckRunSettingsQuickEntryForm = class CheckRunSettingsQuickEntry } } /* jscpd:ignore-end */ + register_primary_action() { + const me = this + this.dialog.set_primary_action(__('Save'), () => { + let values = me.dialog.get_values() + if (!values) return + frappe + .xcall('check_run.check_run.doctype.check_run_settings.check_run_settings.create', { + company: values.company, + bank_account: values.bank_account, + pay_to_account: values.pay_to_account, + }) + .then(r => { + me.dialog.hide() + frappe.set_route('Form', 'Check Run Settings', r.name) + }) + }) + } } diff --git a/check_run/public/js/vite.config.js b/check_run/public/js/vite.config.js index f5650627..620c3e1e 100644 --- a/check_run/public/js/vite.config.js +++ b/check_run/public/js/vite.config.js @@ -3,7 +3,6 @@ import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' -import { getProxyOptions } from 'frappe-ui/src/utils/vite-dev-server' import path, { resolve } from 'path' import { existsSync, readFileSync, writeFileSync } from 'fs' @@ -29,10 +28,6 @@ function frappeAssetsPlugin() { export default defineConfig({ plugins: [vue(), frappeAssetsPlugin()], - server: { - port: 8080, - proxy: getProxyOptions({ port: 8003 }), - }, build: { rollupOptions: { input: { diff --git a/check_run/tests/setup.py b/check_run/tests/setup.py index a50a845f..a7bf8471 100644 --- a/check_run/tests/setup.py +++ b/check_run/tests/setup.py @@ -307,25 +307,6 @@ def create_payment_terms_templates(settings): }, ) doc.save() - if not frappe.db.exists("Payment Terms Template", "Due After Month End"): - pt = frappe.new_doc("Payment Term") - pt.payment_term_name = "Due After Month End" - pt.due_date_based_on = "Month(s) after the end of the invoice month" - pt.invoice_portion = 100 - pt.credit_days = 25 - pt.save() - doc = frappe.new_doc("Payment Terms Template") - doc.template_name = pt.name - doc.append( - "terms", - { - "payment_term": pt.name, - "invoice_portion": pt.invoice_portion, - "due_date_based_on": pt.due_date_based_on, - "credit_days": pt.credit_days, - }, - ) - doc.save() if not frappe.db.exists("Payment Terms Template", "Due After Month End"): pt = frappe.new_doc("Payment Term") diff --git a/check_run/tests/test_sales_tax_remittance.py b/check_run/tests/test_sales_tax_remittance.py new file mode 100644 index 00000000..af046712 --- /dev/null +++ b/check_run/tests/test_sales_tax_remittance.py @@ -0,0 +1,416 @@ +# Copyright (c) 2026, AgriTheory and contributors +# For license information, please see license.txt + +import datetime + +import frappe +import pytest +from erpnext.controllers.sales_and_purchase_return import make_return_doc +from frappe.utils import add_days, flt + +from check_run.check_run.report.sales_tax_remittance.sales_tax_remittance import execute + +year = datetime.date.today().year + + +def make_taxed_si(customer, template_name, posting_date, qty=100, rate=1.30): + si = frappe.new_doc("Sales Invoice") + si.customer = customer + si.set_posting_time = 1 + si.company = "Chelsea Fruit Co" + si.posting_date = posting_date + si.append("items", {"item_code": "Cloudberry", "qty": qty, "rate": rate}) + si.taxes_and_charges = template_name + taxes = frappe.call( + "erpnext.controllers.accounts_controller.get_taxes_and_charges", + master_doctype="Sales Taxes and Charges Template", + master_name=template_name, + ) + for tax in taxes: + si.append("taxes", tax) + si.save() + si.submit() + return si + + +@pytest.mark.order(75) +def test_remittance_report_summary_unremitted(): + """ + Two freshly-submitted VT invoices appear in the summary report as fully + outstanding: nothing has been remitted and no customer has paid. + + | Account | Debit | Credit | Party | + | ---------------------- | --------:| --------:| --------------------------- | + | Accounts Receivable | $138.78 | | Almacs Food Group | + | Sales | | $130.00 | | + | 2320 Sales Tax Payable | | $7.80 | Vermont Department of Taxes | + + (Same GL structure for Beans and Dreams Roasters) + """ + posting_date = datetime.date(year, 11, 1) + for customer in ("Almacs Food Group", "Beans and Dreams Roasters"): + make_taxed_si(customer, "VT Sales Tax - CFC", posting_date) + + data = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + } + )[1] + + # Test 60 created a VT SI in August — filter to the November bucket we own + nov = f"{year}-11" + nov_rows = [r for r in data if r.get("period") == nov] + assert len(nov_rows) == 1, f"Expected 1 summary row for {nov}, got {len(nov_rows)}: {nov_rows}" + row = nov_rows[0] + assert flt(row["total_collected"], 2) == 15.60 + assert flt(row["total_outstanding"], 2) == 15.60 + assert flt(row["total_remitted"], 2) == 0.00 + assert flt(row["customer_paid_amount"], 2) == 0.00 + + +@pytest.mark.order(76) +def test_remittance_report_customer_paid_flag(): + """ + When a customer pays their invoice the detail report's "Customer Paid" + column becomes 1 for that row, but the outstanding tax to the authority + is unchanged — the two obligations are independent. + """ + posting_date = datetime.date(year, 11, 15) + si = make_taxed_si("Cafe 27 Cafeteria", "VT Sales Tax - CFC", posting_date) + + ar_account = frappe.get_value( + "Account", + {"account_type": "Receivable", "company": "Chelsea Fruit Co", "is_group": 0}, + ) + bank_account = frappe.get_value( + "Account", + {"account_type": "Bank", "company": "Chelsea Fruit Co", "is_group": 0}, + ) + currency = frappe.db.get_value("Account", ar_account, "account_currency") + pe = frappe.new_doc("Payment Entry") + pe.payment_type = "Receive" + pe.posting_date = add_days(posting_date, 10) + pe.mode_of_payment = "Check" + pe.company = "Chelsea Fruit Co" + pe.bank_account = "Primary Checking - Local Bank" + pe.party_type = "Customer" + pe.party = "Cafe 27 Cafeteria" + pe.paid_from = ar_account + pe.paid_to = bank_account + pe.paid_from_account_currency = currency + pe.paid_to_account_currency = currency + pe.reference_no = "Test-VT-Customer-Pay-76" + pe.reference_date = pe.posting_date + pe.paid_amount = flt(si.outstanding_amount) + pe.received_amount = flt(si.outstanding_amount) + pe.base_paid_amount = flt(si.outstanding_amount) + pe.base_received_amount = flt(si.outstanding_amount) + pe.append( + "references", + { + "reference_doctype": "Sales Invoice", + "reference_name": si.name, + "due_date": si.due_date, + "total_amount": flt(si.grand_total), + "outstanding_amount": flt(si.outstanding_amount), + "allocated_amount": flt(si.outstanding_amount), + }, + ) + pe.save() + pe.submit() + + detail = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + "show_detail": 1, + } + )[1] + + # Restrict to the November rows we own (test 60 has an August VT row) + nov_detail = [r for r in detail if r.get("posting_date") and r["posting_date"].month == 11] + assert len(nov_detail) == 3, f"Expected 3 November VT rows, got {len(nov_detail)}" + + cafe27_row = next(r for r in nov_detail if r["customer"] == "Cafe 27 Cafeteria") + assert cafe27_row["customer_paid"] == 1, "Cafe 27 customer has paid; flag should be 1" + + for row in nov_detail: + if row["customer"] != "Cafe 27 Cafeteria": + assert row["customer_paid"] == 0, f"{row['customer']} has not paid; customer_paid should be 0" + assert flt(row["outstanding_amount"]) > 0, ( + f"Tax outstanding to VT authority should remain > 0 regardless of customer payment, " + f"got {row['outstanding_amount']} for {row['customer']}" + ) + + summary = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + } + )[1] + nov = f"{year}-11" + nov_row = next(r for r in summary if r.get("period") == nov) + assert ( + flt(nov_row["customer_paid_amount"], 2) == 7.80 + ), "Only the Cafe 27 invoice's tax should count as customer-paid" + assert ( + flt(nov_row["total_outstanding"], 2) == 23.40 + ), "All 3 November VT invoices remain unremitted to the tax authority" + + +@pytest.mark.order(77) +def test_remittance_report_shows_remittance_details(): + """ + After remitting a RI tax liability via Payment Entry, the detail report + shows outstanding = 0, the correct remitted amount, and a link back to + the Payment Entry voucher. + + Remittance Payment Entry GL: + | Account | Debit | Credit | Party | + | ---------------------- | --------:| --------:| ---------------------------------- | + | 2320 Sales Tax Payable | $9.10 | | Rhode Island Division of Taxation | + | Primary Checking | | $9.10 | | + """ + posting_date = datetime.date(year, 10, 1) + si = make_taxed_si("Capital Grille Restaurant Group", "RI Sales Tax - CFC", posting_date) + + ri_tax_row = next(r for r in si.taxes if r.party == "Rhode Island Division of Taxation") + tax_amount = flt(ri_tax_row.tax_amount) + + bank_account = frappe.get_value( + "Account", + {"account_type": "Bank", "company": "Chelsea Fruit Co", "is_group": 0}, + ) + currency = frappe.db.get_value("Account", bank_account, "account_currency") + pe = frappe.new_doc("Payment Entry") + pe.payment_type = "Pay" + pe.posting_date = add_days(posting_date, 30) + pe.mode_of_payment = "Check" + pe.company = "Chelsea Fruit Co" + pe.bank_account = "Primary Checking - Local Bank" + pe.paid_from = bank_account + pe.paid_to = "2320 - Sales Tax Payable - CFC" + pe.paid_from_account_currency = currency + pe.paid_to_account_currency = currency + pe.reference_no = "Test-RI-Remittance-77" + pe.reference_date = pe.posting_date + pe.party_type = "Supplier" + pe.party = "Rhode Island Division of Taxation" + pe.paid_amount = tax_amount + pe.received_amount = tax_amount + pe.base_paid_amount = tax_amount + pe.base_received_amount = tax_amount + pe.append( + "references", + { + "reference_doctype": "Sales Taxes and Charges", + "reference_name": ri_tax_row.name, + "due_date": ri_tax_row.due_date, + "total_amount": tax_amount, + "outstanding_amount": tax_amount, + "allocated_amount": tax_amount, + }, + ) + pe.save() + pe.submit() + + detail = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Rhode Island Division of Taxation", + "show_detail": 1, + } + )[1] + + assert len(detail) == 1, f"Expected 1 RI row, got {len(detail)}" + row = detail[0] + assert flt(row["outstanding_amount"], 2) == 0.00 + assert flt(row["amount_remitted"], 2) == flt(tax_amount, 2) + assert row["remittance_voucher"] == pe.name + assert row["remittance_date"] is not None + + remitted = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Rhode Island Division of Taxation", + "show_detail": 1, + "remittance_status": "Remitted", + } + )[1] + assert len(remitted) == 1, "Remitted filter should still show the fully-paid RI row" + + outstanding = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Rhode Island Division of Taxation", + "show_detail": 1, + "remittance_status": "Outstanding", + } + )[1] + assert len(outstanding) == 0, "Outstanding filter should exclude the fully-remitted RI row" + + +@pytest.mark.order(78) +def test_remittance_report_return_shows_credit(): + """ + When a return SI is submitted against an unremitted invoice, the original's + outstanding is reduced to zero and the return carries a negative outstanding. + Both rows appear in the detail report; the summary reflects the net position. + + Original SI: + | Account | Debit | Credit | Party | + | ---------------------- | --------:| --------:| --------------------------- | + | Accounts Receivable | $138.78 | | Downtown Deli | + | Sales | | $130.00 | | + | 2320 Sales Tax Payable | | $7.80 | Vermont Department of Taxes | + + Return SI (reversal): + | Account | Debit | Credit | Party | + | ---------------------- | --------:| --------:| --------------------------- | + | 2320 Sales Tax Payable | $7.80 | | Vermont Department of Taxes | + | Sales | $7.80 | | | + | Accounts Receivable | | $138.78 | Downtown Deli | + """ + posting_date = datetime.date(year, 11, 20) + si = make_taxed_si("Downtown Deli", "VT Sales Tax - CFC", posting_date) + vt_tax_row = next(r for r in si.taxes if r.party == "Vermont Department of Taxes") + tax_amount = flt(vt_tax_row.tax_amount) + + return_si = make_return_doc("Sales Invoice", si.name) + return_si.posting_date = add_days(posting_date, 1) + return_si.save() + return_si.submit() + + detail = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + "show_detail": 1, + } + )[1] + + nov_detail = [r for r in detail if r.get("posting_date") and r["posting_date"].month == 11] + + original_row = next((r for r in nov_detail if r["sales_invoice"] == si.name), None) + return_row = next((r for r in nov_detail if r["sales_invoice"] == return_si.name), None) + assert original_row, f"Original SI {si.name} should appear in November VT detail" + assert return_row, f"Return SI {return_si.name} should appear in November VT detail" + + assert flt(original_row["tax_amount"], 2) == flt( + tax_amount, 2 + ), "Original row tax_amount should be positive" + assert ( + flt(original_row["outstanding_amount"], 2) == 0.00 + ), "Original outstanding should be 0 — reduced to zero by the return" + assert flt(return_row["tax_amount"], 2) == flt( + -tax_amount, 2 + ), "Return row tax_amount should be negative" + assert flt(return_row["outstanding_amount"], 2) == flt( + -tax_amount, 2 + ), "Return row outstanding should be negative — credit owed back from authority" + + # November summary: 3 unremitted SIs (tests 75, 76) + original (outstanding=0) + return (outstanding=-7.80) + summary = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + } + )[1] + nov = f"{year}-11" + nov_row = next(r for r in summary if r.get("period") == nov) + # total_collected: Almacs(7.80) + Beans(7.80) + Cafe27(7.80) + Downtown(7.80) + return(-7.80) = 23.40 + assert flt(nov_row["total_collected"], 2) == 23.40 + # total_outstanding: 7.80*3 (unremitted) + 0 (original reduced) + (-7.80) (return) = 15.60 + assert flt(nov_row["total_outstanding"], 2) == 15.60 + + +@pytest.mark.order(79) +def test_remittance_report_status_filter(): + """ + The remittance_status filter correctly partitions rows: + - "Outstanding" shows only rows where outstanding > 0 + - "Remitted" shows rows where outstanding <= 0 (fully paid or return credits) + - default ("All") shows all rows including negative-outstanding return credits + """ + nov = f"{year}-11" + + # VT Outstanding: only the 3 unremitted November SIs (Almacs, Beans, Cafe 27) + # Downtown Deli original (outstanding=0) and return (outstanding<0) are excluded + outstanding_vt = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + "show_detail": 1, + "remittance_status": "Outstanding", + } + )[1] + nov_outstanding = [ + r for r in outstanding_vt if r.get("posting_date") and r["posting_date"].month == 11 + ] + assert ( + len(nov_outstanding) == 3 + ), f"Expected 3 outstanding November VT rows, got {len(nov_outstanding)}" + assert all(flt(r["outstanding_amount"]) > 0 for r in nov_outstanding) + outstanding_customers = {r["customer"] for r in nov_outstanding} + assert outstanding_customers == { + "Almacs Food Group", + "Beans and Dreams Roasters", + "Cafe 27 Cafeteria", + } + + # VT Remitted: Downtown Deli original (outstanding=0) and return (outstanding<0) + remitted_vt = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + "show_detail": 1, + "remittance_status": "Remitted", + } + )[1] + nov_remitted = [r for r in remitted_vt if r.get("posting_date") and r["posting_date"].month == 11] + assert len(nov_remitted) == 2, ( + f"Expected 2 'remitted' November VT rows (original outstanding=0, return outstanding<0), " + f"got {len(nov_remitted)}" + ) + assert all(flt(r["outstanding_amount"]) <= 0 for r in nov_remitted) + + # RI Remitted: Capital Grille (fully remitted in test 77) + remitted_ri = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Rhode Island Division of Taxation", + "show_detail": 1, + "remittance_status": "Remitted", + } + )[1] + assert len(remitted_ri) == 1 + assert remitted_ri[0]["customer"] == "Capital Grille Restaurant Group" + + # VT All: 5 November rows (Almacs, Beans, Cafe27, Downtown original, Downtown return) + all_vt = execute( + { + "company": "Chelsea Fruit Co", + "to_date": datetime.date(year, 12, 31), + "tax_authority": "Vermont Department of Taxes", + "show_detail": 1, + } + )[1] + nov_all = [r for r in all_vt if r.get("posting_date") and r["posting_date"].month == 11] + assert len(nov_all) == 5, f"Expected 5 November VT rows in All view, got {len(nov_all)}" + return_rows = [r for r in nov_all if flt(r["tax_amount"]) < 0] + assert len(return_rows) == 1, "Exactly one return (negative tax_amount) row should be present" + assert ( + flt(return_rows[0]["outstanding_amount"]) < 0 + ), "The return row's outstanding should be negative (credit owed from authority)" diff --git a/docs/index.md b/docs/index.md index 992c4370..f0fb09c6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ For license information, please see license.txt--> # Check Run Documentation
- Heather Kusmierz and Tyler Matteson 2026-02-21 + Heather Kusmierz and Tyler Matteson 2026-02-23
@@ -63,6 +63,7 @@ Follow the links below for more information about Check Run's features: - [ACH Generation](./achgeneration.md) - [Render PDF Sequence](./renderpdfsequence.md) - [Positive Pay Report](./positivepay.md) +- [Sales Tax Remittance Report](./sales_tax_remittance_report.md) - [Example Print Format: Voucher Check](./exampleprint.md) - [Example Data: Experimenting with Check Run Using Demo Data](./exampledata.md) - [Translations](./translations.md) diff --git a/docs/sales_tax_remittance_report.md b/docs/sales_tax_remittance_report.md new file mode 100644 index 00000000..4e7e9235 --- /dev/null +++ b/docs/sales_tax_remittance_report.md @@ -0,0 +1,25 @@ + + +# Sales Tax Remittance Report + +
+ Tyler Matteson 2026-04-01 +
+ + +The Sales Tax Remittance Report provides a running view of collected sales tax obligations and their remittance status. It is designed for businesses that track sales tax payable to government authorities via the Sales Taxes and Charges table on their Sales Invoices (see [Sales Tax Payable](./sales_tax_payable.md)). + +To access the report, type "Sales Tax Remittance" into the AwesomeBar. Required filters are Company and Up To Date. Unlike most date-range reports, no start date is required — sales tax is managed on a rolling basis and older liabilities remain visible until remitted. Optional filters include Tax Authority, Tax Account, Remittance Status (`Outstanding`, `Remitted`, or `All`), and Show Detail. + +## Summary View (default) + +Aggregates tax by authority, account, and calendar month. Each row shows the gross tax collected from customers (`total_collected`), how much of that has been received from customers (`customer_paid_amount`), how much has been remitted to the authority (`total_remitted`), and the net amount still owed (`total_outstanding`). Return invoice credits appear as negative values and reduce `total_outstanding` accordingly. + +## Detail View + +Shows one row per Sales Taxes and Charges entry. In addition to the amounts above, each row links to the originating Sales Invoice, shows whether the customer has paid (`customer_paid`), and — once remitted — shows the remittance amount, the Payment Entry voucher, and the remittance date. + +## Returns and Credits + +When a Sales Invoice return is submitted, the original invoice's tax row outstanding is reduced to `0` and the return invoice carries a negative outstanding representing a credit owed back from the authority. Both rows appear in the report. See [Sales Tax Payable](./sales_tax_payable.md) for configuration recommendations around returns. diff --git a/pyproject.toml b/pyproject.toml index ffff7e53..8f67ca20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ pytest-order = "~=1.2.1" skip = "CHANGELOG.md" [tool.pytest.ini_options] -addopts = "-s --disable-warnings" +addopts = "--cov=check_run --cov-report=xml -s --disable-warnings" [tool.black] line-length = 99 diff --git a/yarn.lock b/yarn.lock index 3458fd8b..56429d5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -204,38 +204,39 @@ integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== "@headlessui/vue@^1.5.0": - version "1.7.16" - resolved "https://registry.yarnpkg.com/@headlessui/vue/-/vue-1.7.16.tgz#bdc9d32d329248910325539b99e6abfce0c69f89" - integrity sha512-nKT+nf/q6x198SsyK54mSszaQl/z+QxtASmgMEJtpxSX2Q0OPJX0upS/9daDyiECpeAsvjkoOrm2O/6PyBQ+Qg== + version "1.7.23" + resolved "https://registry.yarnpkg.com/@headlessui/vue/-/vue-1.7.23.tgz#7fe19dbeca35de9e6270c82c78c4864e6a6f7391" + integrity sha512-JzdCNqurrtuu0YW6QaDtR2PIYCKPUWq28csDyMvN4zmGccmE7lz40Is6hc3LA4HFeCI7sekZ/PQMTNmn9I/4Wg== + dependencies: + "@tanstack/vue-virtual" "^3.0.0-beta.60" "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f" + integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA== dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/sourcemap-codec" "^1.5.0" + "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": +"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.20" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" - integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== +"@jridgewell/sourcemap-codec@^1.5.0": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== + +"@jridgewell/trace-mapping@^0.3.24": + version "0.3.31" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0" + integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -266,36 +267,10 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@remirror/core-constants@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.2.tgz#f05eccdc69e3a65e7d524b52548f567904a11a1a" - integrity sha512-dyHY+sMF0ihPus3O27ODd4+agdHMEmuRdyiZJ2CCWjPV5UFmn17ZbElvk6WOGVE4rdCJKZQCrPV2BcikOMLUGQ== - -"@remirror/core-helpers@^3.0.0": +"@remirror/core-constants@3.0.0": version "3.0.0" - resolved "https://registry.yarnpkg.com/@remirror/core-helpers/-/core-helpers-3.0.0.tgz#3a35c2346bc23ebc3cee585b7840b5567755c5f1" - integrity sha512-tusEgQJIqg4qKj6HSBUFcyRnWnziw3neh4T9wOmsPGHFC3w9kl5KSrDb9UAgE8uX6y32FnS7vJ955mWOl3n50A== - dependencies: - "@remirror/core-constants" "^2.0.2" - "@remirror/types" "^1.0.1" - "@types/object.omit" "^3.0.0" - "@types/object.pick" "^1.3.2" - "@types/throttle-debounce" "^2.1.0" - case-anything "^2.1.13" - dash-get "^1.0.2" - deepmerge "^4.3.1" - fast-deep-equal "^3.1.3" - make-error "^1.3.6" - object.omit "^3.0.0" - object.pick "^1.3.0" - throttle-debounce "^3.0.1" - -"@remirror/types@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@remirror/types/-/types-1.0.1.tgz#768502497a0fbbc23338a1586b893f729310cf70" - integrity sha512-VlZQxwGnt1jtQ18D6JqdIF+uFZo525WEqrfp9BOc3COPpK4+AWCgdnAWL+ho6imWcoINlGjR/+3b6y5C1vBVEA== - dependencies: - type-fest "^2.19.0" + resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-3.0.0.tgz#96fdb89d25c62e7b6a5d08caf0ce5114370e3b8f" + integrity sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg== "@samverschueren/stream-to-observable@^0.3.0": version "0.3.1" @@ -317,15 +292,24 @@ mini-svg-data-uri "^1.2.3" "@tailwindcss/typography@^0.5.0": - version "0.5.10" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.10.tgz#2abde4c6d5c797ab49cf47610830a301de4c1e0a" - integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== + version "0.5.19" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.19.tgz#ecb734af2569681eb40932f09f60c2848b909456" + integrity sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg== dependencies: - lodash.castarray "^4.4.0" - lodash.isplainobject "^4.0.6" - lodash.merge "^4.6.2" postcss-selector-parser "6.0.10" +"@tanstack/virtual-core@3.13.23": + version "3.13.23" + resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz#72bcaad8bbf6bd86e0d02776dc7dc968d0aba07b" + integrity sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg== + +"@tanstack/vue-virtual@^3.0.0-beta.60": + version "3.13.23" + resolved "https://registry.yarnpkg.com/@tanstack/vue-virtual/-/vue-virtual-3.13.23.tgz#7dc7445bc7585d59b656906728094ee3c08292f1" + integrity sha512-b5jPluAR6U3eOq6GWAYSpj3ugnAIZgGR0e6aGAgyRse0Yu6MVQQ0ZWm9SArSXWtageogn6bkVD8D//c4IjW3xQ== + dependencies: + "@tanstack/virtual-core" "3.13.23" + "@testing-library/cypress@^8": version "8.0.7" resolved "https://registry.yarnpkg.com/@testing-library/cypress/-/cypress-8.0.7.tgz#18315eba3cf8852808afadf122e4858406384015" @@ -348,205 +332,205 @@ lz-string "^1.5.0" pretty-format "^27.0.2" -"@tiptap/core@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.1.13.tgz#e21f566e81688c826c6f26d2940886734189e193" - integrity sha512-cMC8bgTN63dj1Mv82iDeeLl6sa9kY0Pug8LSalxVEptRmyFVsVxGgu2/6Y3T+9aCYScxfS06EkA8SdzFMAwYTQ== +"@tiptap/core@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.27.2.tgz#679eef9ce673d7243ce28d303852a98cbd1844be" + integrity sha512-ABL1N6eoxzDzC1bYvkMbvyexHacszsKdVPYqhl5GwHLOvpZcv9VE9QaKwDILTyz5voCA0lGcAAXZp+qnXOk5lQ== -"@tiptap/extension-blockquote@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.1.13.tgz#abf01e3a00d72434b08be7f3d7e318c7320db486" - integrity sha512-oe6wSQACmODugoP9XH3Ouffjy4BsOBWfTC+dETHNCG6ZED6ShHN3CB9Vr7EwwRgmm2WLaKAjMO1sVumwH+Z1rg== +"@tiptap/extension-blockquote@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.27.2.tgz#af5fccec360cd94b9d3d8751c868d92e9e70907d" + integrity sha512-oIGZgiAeA4tG3YxbTDfrmENL4/CIwGuP3THtHsNhwRqwsl9SfMk58Ucopi2GXTQSdYXpRJ0ahE6nPqB5D6j/Zw== -"@tiptap/extension-bold@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.1.13.tgz#fb0c8916269be61269e4aef9d1da417daf52b7f1" - integrity sha512-6cHsQTh/rUiG4jkbJer3vk7g60I5tBwEBSGpdxmEHh83RsvevD8+n92PjA24hYYte5RNlATB011E1wu8PVhSvw== +"@tiptap/extension-bold@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.27.2.tgz#612104c1e9eaba4c9301b21daa7ef19a9e487051" + integrity sha512-bR7J5IwjCGQ0s3CIxyMvOCnMFMzIvsc5OVZKscTN5UkXzFsaY6muUAIqtKxayBUucjtUskm5qZowJITCeCb1/A== -"@tiptap/extension-bubble-menu@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.1.13.tgz#884cd2e4e0c9586998baac3d0a14621b177f1859" - integrity sha512-Hm7e1GX3AI6lfaUmr6WqsS9MMyXIzCkhh+VQi6K8jj4Q4s8kY4KPoAyD/c3v9pZ/dieUtm2TfqrOCkbHzsJQBg== +"@tiptap/extension-bubble-menu@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.27.2.tgz#f75eb12a8d2496bcde739b5c20684db635a48b9e" + integrity sha512-VkwlCOcr0abTBGzjPXklJ92FCowG7InU8+Od9FyApdLNmn0utRYGRhw0Zno6VgE9EYr1JY4BRnuSa5f9wlR72w== dependencies: tippy.js "^6.3.7" -"@tiptap/extension-bullet-list@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.1.13.tgz#0a26731ebf98ddfd268884ff1712f7189be7b63c" - integrity sha512-NkWlQ5bLPUlcROj6G/d4oqAxMf3j3wfndGOPp0z8OoXJtVbVoXl/aMSlLbVgE6n8r6CS8MYxKhXNxrb7Ll2foA== +"@tiptap/extension-bullet-list@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.27.2.tgz#2347683ab898471ab7df2c3e63b20e8d3d7c46f3" + integrity sha512-gmFuKi97u5f8uFc/GQs+zmezjiulZmFiDYTh3trVoLRoc2SAHOjGEB7qxdx7dsqmMN7gwiAWAEVurLKIi1lnnw== -"@tiptap/extension-code-block@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.1.13.tgz#3e441d171d3ed821e67291dbf4cbad7e2ea29809" - integrity sha512-E3tweNExPOV+t1ODKX0MDVsS0aeHGWc1ECt+uyp6XwzsN0bdF2A5+pttQqM7sTcMnQkVACGFbn9wDeLRRcfyQg== +"@tiptap/extension-code-block@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.27.2.tgz#0a622d5bf92c9db55e9f5eaba1a6a8d7a015b1f1" + integrity sha512-KgvdQHS4jXr79aU3wZOGBIZYYl9vCB7uDEuRFV4so2rYrfmiYMw3T8bTnlNEEGe4RUeAms1i4fdwwvQp9nR1Dw== -"@tiptap/extension-code@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.1.13.tgz#27a5ca5705e59ca97390fad4d6631bf431690480" - integrity sha512-f5fLYlSgliVVa44vd7lQGvo49+peC+Z2H0Fn84TKNCH7tkNZzouoJsHYn0/enLaQ9Sq+24YPfqulfiwlxyiT8w== +"@tiptap/extension-code@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.27.2.tgz#bfbaf07f67232144c6865ffbea20896e02c6fe6f" + integrity sha512-7X9AgwqiIGXoZX7uvdHQsGsjILnN/JaEVtqfXZnPECzKGaWHeK/Ao4sYvIIIffsyZJA8k5DC7ny2/0sAgr2TuA== "@tiptap/extension-color@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-color/-/extension-color-2.1.13.tgz#f1ea3805db93f308aaf99d8ac80b18fcf13de050" - integrity sha512-T3tJXCIfFxzIlGOhvbPVIZa3y36YZRPYIo2TKsgkTz8LiMob6hRXXNFjsrFDp2Fnu3DrBzyvrorsW7767s4eYg== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-color/-/extension-color-2.27.2.tgz#2716ff99b7ece8ad095283bb62c794df9eabb5dc" + integrity sha512-sOKCP8/2V3sRM3FdWgMe1lFE5ewsWNCRafiVoujS1+TTHGCj4jw6W+LiumBUk7cRI8kXW/rqGWVC4RVdknYUCA== -"@tiptap/extension-document@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.1.13.tgz#5b68fa08e8a79eebd41f1360982db2ddd28ad010" - integrity sha512-wLwiTWsVmZTGIE5duTcHRmW4ulVxNW4nmgfpk95+mPn1iKyNGtrVhGWleLhBlTj+DWXDtcfNWZgqZkZNzhkqYQ== +"@tiptap/extension-document@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.27.2.tgz#697ee04c03c7b37bc37d942d60fcc5fa304988b5" + integrity sha512-CFhAYsPnyYnosDC4639sCJnBUnYH4Cat9qH5NZWHVvdgtDwu8GZgZn2eSzaKSYXWH1vJ9DSlCK+7UyC3SNXIBA== -"@tiptap/extension-dropcursor@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.1.13.tgz#2e8908f2dec9e8e997a2f216a11d3b915fe062df" - integrity sha512-NAyJi4BJxH7vl/2LNS1X0ndwFKjEtX+cRgshXCnMyh7qNpIRW6Plczapc/W1OiMncOEhZJfpZfkRSfwG01FWFg== +"@tiptap/extension-dropcursor@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.27.2.tgz#c0f62e32a6c7bc7dc8cc6b6edd84d9173bc1db16" + integrity sha512-oEu/OrktNoQXq1x29NnH/GOIzQZm8ieTQl3FK27nxfBPA89cNoH4mFEUmBL5/OFIENIjiYG3qWpg6voIqzswNw== -"@tiptap/extension-floating-menu@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.1.13.tgz#e12e6e73ee095319d4a723a9b46b8f7b1a9f4b1a" - integrity sha512-9Oz7pk1Nts2+EyY+rYfnREGbLzQ5UFazAvRhF6zAJdvyuDmAYm0Jp6s0GoTrpV0/dJEISoFaNpPdMJOb9EBNRw== +"@tiptap/extension-floating-menu@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.27.2.tgz#b04e8f542d3900db1d845a03a0f5ab079a06daaf" + integrity sha512-GUN6gPIGXS7ngRJOwdSmtBRBDt9Kt9CM/9pSwKebhLJ+honFoNA+Y6IpVyDvvDMdVNgBchiJLs6qA5H97gAePQ== dependencies: tippy.js "^6.3.7" -"@tiptap/extension-gapcursor@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.1.13.tgz#994a54e1d4106dfaede0acce184c48457ab34450" - integrity sha512-Cl5apsoTcyPPCgE3ThufxQxZ1wyqqh+9uxUN9VF9AbeTkid6oPZvKXwaILf6AFnkSy+SuKrb9kZD2iaezxpzXw== +"@tiptap/extension-gapcursor@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.27.2.tgz#2e82dd87cb2dfcca90f0abb3b43f1f6748a54e2c" + integrity sha512-/c9VF1HBxj+AP54XGVgCmD9bEGYc5w5OofYCFQgM7l7PB1J00A4vOke0oPkHJnqnOOyPlFaxO/7N6l3XwFcnKA== -"@tiptap/extension-hard-break@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.1.13.tgz#fc84d0ff7e2fe861bf421bc8000194ecc26979b0" - integrity sha512-TGkMzMQayuKg+vN4du0x1ahEItBLcCT1jdWeRsjdM8gHfzbPLdo4PQhVsvm1I0xaZmbJZelhnVsUwRZcIu1WNA== +"@tiptap/extension-hard-break@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.27.2.tgz#250200feb316cfb40ed8e9188ee6684c2811b475" + integrity sha512-kSRVGKlCYK6AGR0h8xRkk0WOFGXHIIndod3GKgWU49APuIGDiXd8sziXsSlniUsWmqgDmDXcNnSzPcV7AQ8YNg== -"@tiptap/extension-heading@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.1.13.tgz#94a6219448d97ffed0915fa1bf411074c39f4103" - integrity sha512-PEmc19QLmlVUTiHWoF0hpgNTNPNU0nlaFmMKskzO+cx5Df4xvHmv/UqoIwp7/UFbPMkfVJT1ozQU7oD1IWn9Hg== +"@tiptap/extension-heading@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.27.2.tgz#10afd812475c6a3f62a26bd1975998bfa94cb9fb" + integrity sha512-iM3yeRWuuQR/IRQ1djwNooJGfn9Jts9zF43qZIUf+U2NY8IlvdNsk2wTOdBgh6E0CamrStPxYGuln3ZS4fuglw== "@tiptap/extension-highlight@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.1.13.tgz#d30221c178569264ab76327f87a0d81605493fcc" - integrity sha512-ZivjJma5WwPYcG0rpnynVDGis32OGdtpTwETEb+2OOjZBCBlyYQ4tcRk5gS3nzBAjLl/Qu84VVbawLhHXB6few== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.27.2.tgz#5647a82ac2e1c04532e0d8dbc15946f58d6151ae" + integrity sha512-ZjlktDdMjruMJFAVz0TbQf0v92Jqkc7Ri1iZJqBXuLid+r+GxUzl2CVAV7qq5yagkGQgvAG+WGsMk880HgR3MA== -"@tiptap/extension-history@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.1.13.tgz#50478c602143fa77bb3b45c9c9cae4ddb743e0ed" - integrity sha512-1ouitThGTBUObqw250aDwGLMNESBH5PRXIGybsCFO1bktdmWtEw7m72WY41EuX2BH8iKJpcYPerl3HfY1vmCNw== +"@tiptap/extension-history@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.27.2.tgz#43c6d976c521dc1cf2d4a0707df7d8328be0e9a9" + integrity sha512-+hSyqERoFNTWPiZx4/FCyZ/0eFqB9fuMdTB4AC/q9iwu3RNWAQtlsJg5230bf/qmyO6bZxRUc0k8p4hrV6ybAw== -"@tiptap/extension-horizontal-rule@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.1.13.tgz#4884dbf912c8dabbbc69e041ff5529d6337e638e" - integrity sha512-7OgjgNqZXvBejgULNdMSma2M1nzv4bbZG+FT5XMFZmEOxR9IB1x/RzChjPdeicff2ZK2sfhMBc4Y9femF5XkUg== +"@tiptap/extension-horizontal-rule@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.27.2.tgz#7440adb913dfe270577d1853cfc2f725f36e0040" + integrity sha512-WGWUSgX+jCsbtf9Y9OCUUgRZYuwjVoieW5n6mAUohJ9/6gc6sGIOrUpBShf+HHo6WD+gtQjRd+PssmX3NPWMpg== "@tiptap/extension-image@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.1.13.tgz#835fc6759b2c1184fb54d3704c538029d523dbf6" - integrity sha512-7oVAos+BU4KR/zQsfltrd8hgIxKxyxZ19dhwb1BJI2Nt3Mnx+yFPRlRSehID6RT9dYqgW4UW5d6vh/3HQcYYYw== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.27.2.tgz#c962eaae3d390e1641cffacdbd61af613306c32c" + integrity sha512-5zL/BY41FIt72azVrCrv3n+2YJ/JyO8wxCcA4Dk1eXIobcgVyIdo4rG39gCqIOiqziAsqnqoj12QHTBtHsJ6mQ== -"@tiptap/extension-italic@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.1.13.tgz#1e9521dea002c8d6de833d9fd928d4617623eab8" - integrity sha512-HyDJfuDn5hzwGKZiANcvgz6wcum6bEgb4wmJnfej8XanTMJatNVv63TVxCJ10dSc9KGpPVcIkg6W8/joNXIEbw== +"@tiptap/extension-italic@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.27.2.tgz#91b6ded7b84ed218a8c07ed979332d0dbf923d2b" + integrity sha512-1OFsw2SZqfaqx5Fa5v90iNlPRcqyt+lVSjBwTDzuPxTPFY4Q0mL89mKgkq2gVHYNCiaRkXvFLDxaSvBWbmthgg== "@tiptap/extension-link@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.1.13.tgz#ae4abd7c43292e3a1841488bfc7a687b2f014249" - integrity sha512-wuGMf3zRtMHhMrKm9l6Tft5M2N21Z0UP1dZ5t1IlOAvOeYV2QZ5UynwFryxGKLO0NslCBLF/4b/HAdNXbfXWUA== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.27.2.tgz#f250b6119b02f836e0746af4c28766b643b78f6c" + integrity sha512-bnP61qkr0Kj9Cgnop1hxn2zbOCBzNtmawxr92bVTOE31fJv6FhtCnQiD6tuPQVGMYhcmAj7eihtvuEMFfqEPcQ== dependencies: - linkifyjs "^4.1.0" + linkifyjs "^4.3.2" -"@tiptap/extension-list-item@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.1.13.tgz#3c62127df97974f3196866ec00ee397f4c9acdc4" - integrity sha512-6e8iiCWXOiJTl1XOwVW2tc0YG18h70HUtEHFCx2m5HspOGFKsFEaSS3qYxOheM9HxlmQeDt8mTtqftRjEFRxPQ== +"@tiptap/extension-list-item@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.27.2.tgz#562a8a5f56ed7ac70cd4fab37d7fbcd29e9dc078" + integrity sha512-eJNee7IEGXMnmygM5SdMGDC8m/lMWmwNGf9fPCK6xk0NxuQRgmZHL6uApKcdH6gyNcRPHCqvTTkhEP7pbny/fg== "@tiptap/extension-mention@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.1.13.tgz#6359c563268c46539660958847fe76c22131f2c8" - integrity sha512-OYqaucyBiCN/CmDYjpOVX74RJcIEKmAqiZxUi8Gfaq7ryEO5a8Gk93nK+8uZ0onaqHE+mHpoLFFbcAFbOPgkUQ== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.27.2.tgz#13d66c56fa57dc7c28f561459d2ffb3936ad2fe3" + integrity sha512-uHxVf8RISscb4xgCEJmDSNcFQmzlBTKJh7fp2QAXWIF4Xtrg3zD08PIXUvvHapoluGD9OdBugW4YCu1PJ3xWNw== -"@tiptap/extension-ordered-list@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.1.13.tgz#31f4b3a21fbcc2f605c48662e08b5253a304c8c7" - integrity sha512-UO4ZAL5Vrr1WwER5VjgmeNIWHpqy9cnIRo1En07gZ0OWTjs1eITPcu+4TCn1ZG6DhoFvAQzE5DTxxdhIotg+qw== +"@tiptap/extension-ordered-list@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.27.2.tgz#12f2c4309512429a0c21863e741db00356573a4b" + integrity sha512-M7A4tLGJcLPYdLC4CI2Gwl8LOrENQW59u3cMVa+KkwG1hzSJyPsbDpa1DI6oXPC2WtYiTf22zrbq3gVvH+KA2w== -"@tiptap/extension-paragraph@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.1.13.tgz#30f8ae3f8833c606b339f3554b9ffdbe1e604463" - integrity sha512-cEoZBJrsQn69FPpUMePXG/ltGXtqKISgypj70PEHXt5meKDjpmMVSY4/8cXvFYEYsI9GvIwyAK0OrfAHiSoROA== +"@tiptap/extension-paragraph@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.27.2.tgz#e6873c16993bf21b831ecac41bbd137dc5945eb4" + integrity sha512-elYVn2wHJJ+zB9LESENWOAfI4TNT0jqEN34sMA/hCtA4im1ZG2DdLHwkHIshj/c4H0dzQhmsS/YmNC5Vbqab/A== "@tiptap/extension-placeholder@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.1.13.tgz#b735591f719b9fe89c90dcc6327d2ef2851be510" - integrity sha512-vIY7y7UbqsrAW/y8bDE9eRenbQEU16kNHB5Wri8RU1YiUZpkPgdXP/pLqyjIIq95SwP/vdTIHjHoQ77VLRl1hA== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.27.2.tgz#5ac421cbc0bb2bf5909e3dcc9a61fec19cab0c53" + integrity sha512-IjsgSVYJRjpAKmIoapU0E2R4E2FPY3kpvU7/1i7PUYisylqejSJxmtJPGYw0FOMQY9oxnEEvfZHMBA610tqKpg== -"@tiptap/extension-strike@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.1.13.tgz#6605792fa98f0e36861be4c7ed4d4125de8c77aa" - integrity sha512-VN6zlaCNCbyJUCDyBFxavw19XmQ4LkCh8n20M8huNqW77lDGXA2A7UcWLHaNBpqAijBRu9mWI8l4Bftyf2fcAw== +"@tiptap/extension-strike@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.27.2.tgz#9291f6dd9bcf00e1c2b7e043f9d9b18cf35f1db1" + integrity sha512-HHIjhafLhS2lHgfAsCwC1okqMsQzR4/mkGDm4M583Yftyjri1TNA7lzhzXWRFWiiMfJxKtdjHjUAQaHuteRTZw== "@tiptap/extension-table-cell@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.1.13.tgz#28efbc99480d53346200dcbf50cfb32bade180d1" - integrity sha512-30pyVt2PxGAk8jmsXKxDheql8K/xIRA9FiDo++kS2Kr6Y7I42/kNPQttJ2W+Q1JdRJvedNfQtziQfKWDRLLCNA== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.27.2.tgz#ff7a7b854bd7536e81345813cef1c3f38f2eff55" + integrity sha512-9Lk46MjZMFzVZfOj9Kd7VgC6Odt6vmEhlCYVumErShUY7EkFqCw3b2IYoUtQkntfOEx/Afnhff/okNQwPsJeUA== "@tiptap/extension-table-header@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.1.13.tgz#8d64a0e5a6a5ea128708b866e56a0e04e34d7a5b" - integrity sha512-FwIV5iso5kmpu01QyvrPCjJqZfqxRTjtjMsDyut2uIgx9v5TXk0V5XvMWobx435ANIDJoGTYCMRlIqcgtyqwAQ== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.27.2.tgz#9b006bb4cc0a1b8e6038803e9ab2533273535a19" + integrity sha512-ZEb6lbG0NbbodWLV0b4BS/QrDIPlUbCcuOsUxzqVvlMUY1Vg6Fj6fKwLaBcsIUDHi8sxZDBEgYEDw3BR/zcO6A== "@tiptap/extension-table-row@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.1.13.tgz#ef75d6de9c7695bbb90f745aabd72d327f161ac3" - integrity sha512-27Mb9/oYbiLd+/BUFMhQzRIqMd2Z5j1BZMYsktwtDG8vGdYVlaW257UVaoNR9TmiXyIzd3Dh1mOil8G35+HRHg== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.27.2.tgz#8fe2a648fb005e9cbf9da2bc08e3c04becd260ce" + integrity sha512-Nw9+tA56Y5HtLVP01NGCZSUuTQhJPtfK9OfmDgGgcxynn2cRVdEtj+9FNZqRhQ1iRVaAI+Rd4xRvX9qYePMOxw== "@tiptap/extension-table@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.1.13.tgz#cfe3fc2665d12d2c946fc83b2cce9d1485ff29a0" - integrity sha512-yMWt2LqotOsWJhLwFNo8fyTwJNLPtnk+eCUxKLlMXP23mJ/lpF+jvTihhHVVic5GqV9vLYZFU2Tn+5k/Vd5P1w== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.27.2.tgz#0f738d5205579a770323d19da5c5b49a1f61a169" + integrity sha512-pDbhOpT5phZkcsyPjGBQlXv0+0hmdrvqHJ+dJjkGcCtlfy2pHiEIhmIItOFagc7wXy8G9iUFZ9Jie4zvDf+brg== "@tiptap/extension-text-align@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.1.13.tgz#1249f8969e4d1ad23ec3794e767aeea5c1e01944" - integrity sha512-ZmbGpi5FHGsWyzt+8DceXERr/Vwxhjpm2VKWZyFTVz8uNJVj+/ou196JQJZqxbp5VtKkS7UYujaO++G5eflb0Q== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.27.2.tgz#ce29f871526d32502bd9f3292b84a57d76d66e60" + integrity sha512-0Pyks6Hu+Q/+9+5/osoSv0SP6jIerdWMYbi13aaZLsJoj3lBj5WNaE11JtAwSFN5sx0IbqhDSlp1zkvRnzgZ8g== -"@tiptap/extension-text-style@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-2.1.13.tgz#4ee7c8cc50272f0977a8d2edae22f063f63d1fe5" - integrity sha512-K9/pNHxpZKQoc++crxrsppVUSeHv8YevfY2FkJ4YMaekGcX+q4BRrHR0tOfii4izAUPJF2L0/PexLQaWXtAY1w== +"@tiptap/extension-text-style@^2.0.0-beta.205", "@tiptap/extension-text-style@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-2.27.2.tgz#5f27d512e8421b5160be37aab17c47dde88a8bea" + integrity sha512-Omk+uxjJLyEY69KStpCw5fA9asvV+MGcAX2HOxyISDFoLaL49TMrNjhGAuz09P1L1b0KGXo4ml7Q3v/Lfy4WPA== -"@tiptap/extension-text@^2.1.13": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.1.13.tgz#ac17a0220aef1bae1bbd646a91491353e57bb5d1" - integrity sha512-zzsTTvu5U67a8WjImi6DrmpX2Q/onLSaj+LRWPh36A1Pz2WaxW5asZgaS+xWCnR+UrozlCALWa01r7uv69jq0w== +"@tiptap/extension-text@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.27.2.tgz#8b387a95cef4adb112bfb1ed00a8bc50d9204476" + integrity sha512-Xk7nYcigljAY0GO9hAQpZ65ZCxqOqaAlTPDFcKerXmlkQZP/8ndx95OgUb1Xf63kmPOh3xypurGS2is3v0MXSA== "@tiptap/extension-typography@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/extension-typography/-/extension-typography-2.1.13.tgz#eadf8c7423290f717547e21342470cc2333a5dd8" - integrity sha512-//90Gzkci4/77CCmdWYyRGTcMUvsQ64jv3mqlL+JqWgLCffMHvWPGKhPMgSzoyHRlAIIACMhxniRtB7HixhTHQ== - -"@tiptap/pm@^2.0.0-beta.220": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.1.13.tgz#857753691580be760da13629fab2712c52750741" - integrity sha512-zNbA7muWsHuVg12GrTgN/j119rLePPq5M8dZgkKxUwdw8VmU3eUyBp1SihPEXJ2U0MGdZhNhFX7Y74g11u66sg== - dependencies: - prosemirror-changeset "^2.2.0" - prosemirror-collab "^1.3.0" - prosemirror-commands "^1.3.1" - prosemirror-dropcursor "^1.5.0" - prosemirror-gapcursor "^1.3.1" - prosemirror-history "^1.3.0" - prosemirror-inputrules "^1.2.0" - prosemirror-keymap "^1.2.0" - prosemirror-markdown "^1.10.1" - prosemirror-menu "^1.2.1" - prosemirror-model "^1.18.1" - prosemirror-schema-basic "^1.2.0" - prosemirror-schema-list "^1.2.2" - prosemirror-state "^1.4.1" - prosemirror-tables "^1.3.0" - prosemirror-trailing-node "^2.0.2" - prosemirror-transform "^1.7.0" - prosemirror-view "^1.28.2" + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/extension-typography/-/extension-typography-2.27.2.tgz#1cbff5833ed8335da47b1b13e7193bcc82248ab8" + integrity sha512-NSyqDa8PlAZoVRfTWQuxueTZ6ftOD72EV7UKVpftf3C+Heme727mvwl1YHMnagOlqVoxBhFOrl9CnSs/q5uayQ== + +"@tiptap/pm@^2.0.0-beta.220", "@tiptap/pm@^2.27.2": + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.27.2.tgz#2e8b187df66eea54702cfba9820800c8d10c21ef" + integrity sha512-kaEg7BfiJPDQMKbjVIzEPO3wlcA+pZb2tlcK9gPrdDnEFaec2QTF1sXz2ak2IIb2curvnIrQ4yrfHgLlVA72wA== + dependencies: + prosemirror-changeset "^2.3.0" + prosemirror-collab "^1.3.1" + prosemirror-commands "^1.6.2" + prosemirror-dropcursor "^1.8.1" + prosemirror-gapcursor "^1.3.2" + prosemirror-history "^1.4.1" + prosemirror-inputrules "^1.4.0" + prosemirror-keymap "^1.2.2" + prosemirror-markdown "^1.13.1" + prosemirror-menu "^1.2.4" + prosemirror-model "^1.23.0" + prosemirror-schema-basic "^1.2.3" + prosemirror-schema-list "^1.4.1" + prosemirror-state "^1.4.3" + prosemirror-tables "^1.6.4" + prosemirror-trailing-node "^3.0.0" + prosemirror-transform "^1.10.2" + prosemirror-view "^1.37.0" "@tiptap/prosemirror-tables@^1.1.3": version "1.1.4" @@ -554,63 +538,73 @@ integrity sha512-O2XnDhZV7xTHSFxMMl8Ei3UVeCxuMlbGYZ+J2QG8CzkK8mxDpBa66kFr5DdyAhvdi1ptpcH9u7/GMwItQpN4sA== "@tiptap/starter-kit@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.1.13.tgz#ac33a8b4767b83e4daff8819f4a5f0239df1654c" - integrity sha512-ph/mUR/OwPtPkZ5rNHINxubpABn8fHnvJSdhXFrY/q6SKoaO11NZXgegRaiG4aL7O6Sz4LsZVw6Sm0Ae+GJmrg== - dependencies: - "@tiptap/core" "^2.1.13" - "@tiptap/extension-blockquote" "^2.1.13" - "@tiptap/extension-bold" "^2.1.13" - "@tiptap/extension-bullet-list" "^2.1.13" - "@tiptap/extension-code" "^2.1.13" - "@tiptap/extension-code-block" "^2.1.13" - "@tiptap/extension-document" "^2.1.13" - "@tiptap/extension-dropcursor" "^2.1.13" - "@tiptap/extension-gapcursor" "^2.1.13" - "@tiptap/extension-hard-break" "^2.1.13" - "@tiptap/extension-heading" "^2.1.13" - "@tiptap/extension-history" "^2.1.13" - "@tiptap/extension-horizontal-rule" "^2.1.13" - "@tiptap/extension-italic" "^2.1.13" - "@tiptap/extension-list-item" "^2.1.13" - "@tiptap/extension-ordered-list" "^2.1.13" - "@tiptap/extension-paragraph" "^2.1.13" - "@tiptap/extension-strike" "^2.1.13" - "@tiptap/extension-text" "^2.1.13" + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.27.2.tgz#8cad96757376109ce9028c0dc2e941778e5051e9" + integrity sha512-bb0gJvPoDuyRUQ/iuN52j1//EtWWttw+RXAv1uJxfR0uKf8X7uAqzaOOgwjknoCIDC97+1YHwpGdnRjpDkOBxw== + dependencies: + "@tiptap/core" "^2.27.2" + "@tiptap/extension-blockquote" "^2.27.2" + "@tiptap/extension-bold" "^2.27.2" + "@tiptap/extension-bullet-list" "^2.27.2" + "@tiptap/extension-code" "^2.27.2" + "@tiptap/extension-code-block" "^2.27.2" + "@tiptap/extension-document" "^2.27.2" + "@tiptap/extension-dropcursor" "^2.27.2" + "@tiptap/extension-gapcursor" "^2.27.2" + "@tiptap/extension-hard-break" "^2.27.2" + "@tiptap/extension-heading" "^2.27.2" + "@tiptap/extension-history" "^2.27.2" + "@tiptap/extension-horizontal-rule" "^2.27.2" + "@tiptap/extension-italic" "^2.27.2" + "@tiptap/extension-list-item" "^2.27.2" + "@tiptap/extension-ordered-list" "^2.27.2" + "@tiptap/extension-paragraph" "^2.27.2" + "@tiptap/extension-strike" "^2.27.2" + "@tiptap/extension-text" "^2.27.2" + "@tiptap/extension-text-style" "^2.27.2" + "@tiptap/pm" "^2.27.2" "@tiptap/suggestion@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.1.13.tgz#0a8317260baed764a523a09099c0889a0e5b507e" - integrity sha512-Y05TsiXTFAJ5SrfoV+21MAxig5UNbY0AVa03lQlh/yicTRPpIc6hgZzblB0uxDSYoj6+kaHE4MIZvPvhUD8BJQ== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.27.2.tgz#901c1bbb5f12002cfe78a1ad40577727c23c374e" + integrity sha512-dQyvCIg0hcAVeh4fCIVCxogvbp+bF+GpbUb8sNlgnGrmHXnapGxzkvrlHnvneXZxLk/j7CxmBPKJNnm4Pbx4zw== "@tiptap/vue-3@^2.0.0-beta.205": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@tiptap/vue-3/-/vue-3-2.1.13.tgz#836aef02a5df9fc7dc953a0ad3a12e5556dc8680" - integrity sha512-sPMT+uXtPfYLQioXtxxMLij234++PEf5Z43/auOLu737pKdgBr7w0sC8oYiZMgFt9dNCZWBrvT0fupF8yQN8AQ== + version "2.27.2" + resolved "https://registry.yarnpkg.com/@tiptap/vue-3/-/vue-3-2.27.2.tgz#5a2dd974d3cee785c56a74bfc37cc813d3d86dde" + integrity sha512-NahnVLTAQsbLaNU9nGLdGCr88nAeQZJTejjBVQc3EzMdijmE46R44Rosj6O/pj3e7eLj1/gYvc+U/hIVbxMpoQ== dependencies: - "@tiptap/extension-bubble-menu" "^2.1.13" - "@tiptap/extension-floating-menu" "^2.1.13" + "@tiptap/extension-bubble-menu" "^2.27.2" + "@tiptap/extension-floating-menu" "^2.27.2" "@types/aria-query@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q== +"@types/linkify-it@^5": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-5.0.0.tgz#21413001973106cda1c3a9b91eedd4ccd5469d76" + integrity sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q== + +"@types/markdown-it@^14.0.0": + version "14.1.2" + resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-14.1.2.tgz#57f2532a0800067d9b934f3521429a2e8bfb4c61" + integrity sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog== + dependencies: + "@types/linkify-it" "^5" + "@types/mdurl" "^2" + +"@types/mdurl@^2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-2.0.0.tgz#d43878b5b20222682163ae6f897b20447233bdfd" + integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg== + "@types/node@12.12.50": version "12.12.50" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.50.tgz#e9b2e85fafc15f2a8aa8fdd41091b983da5fd6ee" integrity sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w== -"@types/object.omit@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/object.omit/-/object.omit-3.0.3.tgz#cc52b1d9774c1619b5c6fc50229d087f01eabd68" - integrity sha512-xrq4bQTBGYY2cw+gV4PzoG2Lv3L0pjZ1uXStRRDQoATOYW1lCsFQHhQ+OkPhIcQoqLjAq7gYif7D14Qaa6Zbew== - -"@types/object.pick@^1.3.2": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@types/object.pick/-/object.pick-1.3.4.tgz#1a38b6e69a35f36ec2dcc8b9f5ffd555c1c4d7fc" - integrity sha512-5PjwB0uP2XDp3nt5u5NJAG2DORHIRClPzWT/TTZhJ2Ekwe8M5bA9tvPdi9NO/n2uvu2/ictat8kgqvLfcIE1SA== - "@types/sinonjs__fake-timers@^6.0.1": version "6.0.4" resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d" @@ -621,11 +615,6 @@ resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ== -"@types/throttle-debounce@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz#1c3df624bfc4b62f992d3012b84c56d41eab3776" - integrity sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ== - "@vitejs/plugin-vue@^4.0.0": version "4.5.1" resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.5.1.tgz#84815bfeb46928c03a9ed765e4a8425c22345e15" @@ -841,15 +830,14 @@ at-least-node@^1.0.0: integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== autoprefixer@^10.4.2: - version "10.4.16" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8" - integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ== - dependencies: - browserslist "^4.21.10" - caniuse-lite "^1.0.30001538" - fraction.js "^4.3.6" - normalize-range "^0.1.2" - picocolors "^1.0.0" + version "10.4.27" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.27.tgz#51ea301a5c3c5f8642f8e564759c4f573be486f2" + integrity sha512-NP9APE+tO+LuJGn7/9+cohklunJsXWiaWEfV3si4Gi/XHDwVNgkwr1J3RQYFIvPy76GmJ9/bW8vyoU1LcxwKHA== + dependencies: + browserslist "^4.28.1" + caniuse-lite "^1.0.30001774" + fraction.js "^5.3.4" + picocolors "^1.1.1" postcss-value-parser "^4.2.0" available-typed-arrays@^1.0.5: @@ -872,6 +860,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +baseline-browser-mapping@^2.10.12: + version "2.10.13" + resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.13.tgz#5a154cc4589193015a274e3d18319b0d76b9224e" + integrity sha512-BL2sTuHOdy0YT1lYieUxTw/QMtPBC3pmlJC6xk8BBYVv6vcw3SGdKemQ+Xsx9ik2F/lYDO9tqsFQH1r9PFuHKw== + bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -902,22 +895,30 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.2, braces@~3.0.2: +braces@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + +braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" -browserslist@^4.21.10: - version "4.22.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" - integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== +browserslist@^4.28.1: + version "4.28.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.2.tgz#f50b65362ef48974ca9f50b3680566d786b811d2" + integrity sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg== dependencies: - caniuse-lite "^1.0.30001565" - electron-to-chromium "^1.4.601" - node-releases "^2.0.14" - update-browserslist-db "^1.0.13" + baseline-browser-mapping "^2.10.12" + caniuse-lite "^1.0.30001782" + electron-to-chromium "^1.5.328" + node-releases "^2.0.36" + update-browserslist-db "^1.2.3" buffer-crc32@~0.2.3: version "0.2.13" @@ -947,15 +948,10 @@ camelcase-css@^2.0.1: resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== -caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001565: - version "1.0.30001566" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz#61a8e17caf3752e3e426d4239c549ebbb37fef0d" - integrity sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA== - -case-anything@^2.1.13: - version "2.1.13" - resolved "https://registry.yarnpkg.com/case-anything/-/case-anything-2.1.13.tgz#0cdc16278cb29a7fcdeb072400da3f342ba329e9" - integrity sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng== +caniuse-lite@^1.0.30001774, caniuse-lite@^1.0.30001782: + version "1.0.30001784" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001784.tgz#bdf9733a0813ccfb5ab4d02f2127e62ee4c6b718" + integrity sha512-WU346nBTklUV9YfUl60fqRbU5ZqyXlqvo1SgigE1OAXK5bFL8LL9q1K7aap3N739l4BvNqnkm3YrGHiY9sfUQw== caseless@~0.12.0: version "0.12.0" @@ -995,10 +991,10 @@ check-more-types@^2.24.0: resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA== -chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== +chokidar@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -1212,11 +1208,6 @@ cypress@^6: url "^0.11.0" yauzl "^2.10.0" -dash-get@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dash-get/-/dash-get-1.0.2.tgz#4c9e9ad5ef04c4bf9d3c9a451f6f7997298dcc7c" - integrity sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ== - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1286,11 +1277,6 @@ deep-equal@^2.0.5: which-collection "^1.0.1" which-typed-array "^1.1.9" -deepmerge@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" - integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== - define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" @@ -1327,10 +1313,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.4.601: - version "1.4.603" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.603.tgz#446907c21d333b55d0beaba1cb5b48430775a8a7" - integrity sha512-Dvo5OGjnl7AZTU632dFJtWj0uJK835eeOVQIuRcmBmsFsTNn3cL05FqOyHAfGQDIoHfLhyJ1Tya3PJ0ceMz54g== +electron-to-chromium@^1.5.328: + version "1.5.330" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.330.tgz#0efe031938fc8fc82126162a7bd466ba7e24cd38" + integrity sha512-jFNydB5kFtYUobh4IkWUnXeyDbjf/r9gcUEXe1xcrcUxIGfTdzPXA+ld6zBRbwvgIGVzDll/LTIiDztEtckSnA== elegant-spinner@^1.0.1: version "1.0.1" @@ -1365,10 +1351,10 @@ engine.io-parser@~5.2.1: resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb" integrity sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ== -entities@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== es-get-iterator@^1.1.3: version "1.1.3" @@ -1413,10 +1399,10 @@ esbuild@^0.18.10: "@esbuild/win32-ia32" "0.18.20" "@esbuild/win32-x64" "0.18.20" -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" @@ -1490,26 +1476,21 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== -fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== +fast-glob@^3.3.2: + version "3.3.3" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" + integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.4" + micromatch "^4.0.8" fastq@^1.6.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" - integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== + version "1.20.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.1.tgz#ca750a10dc925bc8b18839fd203e3ef4b3ced675" + integrity sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw== dependencies: reusify "^1.0.4" @@ -1520,6 +1501,11 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +fdir@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350" + integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg== + feather-icons@^4.28.0: version "4.29.1" resolved "https://registry.yarnpkg.com/feather-icons/-/feather-icons-4.29.1.tgz#f222aaa4cc6fca499356660c9de6c009ee2cb117" @@ -1550,6 +1536,13 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== + dependencies: + to-regex-range "^5.0.1" + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -1571,10 +1564,10 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -fraction.js@^4.3.6: - version "4.3.7" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" - integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== +fraction.js@^5.3.4: + version "5.3.4" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-5.3.4.tgz#8c0fcc6a9908262df4ed197427bdeef563e0699a" + integrity sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ== frappe-ui@^0.0.105: version "0.0.105" @@ -1692,18 +1685,6 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.1.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -1788,10 +1769,10 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== +hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== dependencies: function-bind "^1.1.2" @@ -1897,12 +1878,12 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.13.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== +is-core-module@^2.16.1: + version "2.16.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" + integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== dependencies: - hasown "^2.0.0" + hasown "^2.0.2" is-date-object@^1.0.5: version "1.0.5" @@ -1911,13 +1892,6 @@ is-date-object@^1.0.5: dependencies: has-tostringtag "^1.0.0" -is-extendable@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -1984,13 +1958,6 @@ is-path-inside@^3.0.1: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - is-promise@^2.1.0: version "2.2.2" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" @@ -2085,20 +2052,15 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== -jiti@^1.19.1: - version "1.21.0" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" - integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== +jiti@^1.21.7: + version "1.21.7" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9" + integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A== js-tokens@^4.0.0: version "4.0.0" @@ -2144,32 +2106,27 @@ lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw== -lilconfig@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - -lilconfig@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc" - integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== +lilconfig@^3.1.1, lilconfig@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4" + integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw== lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -linkify-it@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" - integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== +linkify-it@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421" + integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ== dependencies: - uc.micro "^1.0.1" + uc.micro "^2.0.0" -linkifyjs@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.3.tgz#0edbc346428a7390a23ea2e5939f76112c9ae07f" - integrity sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg== +linkifyjs@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.3.2.tgz#d97eb45419aabf97ceb4b05a7adeb7b8c8ade2b1" + integrity sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA== listr-silent-renderer@^1.1.1: version "1.1.1" @@ -2215,21 +2172,6 @@ listr@^0.14.3: p-map "^2.0.0" rxjs "^6.3.3" -lodash.castarray@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" - integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q== - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - lodash.once@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" @@ -2276,26 +2218,22 @@ magic-string@^0.30.5: dependencies: "@jridgewell/sourcemap-codec" "^1.4.15" -make-error@^1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -markdown-it@^13.0.1: - version "13.0.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536" - integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w== +markdown-it@^14.0.0: + version "14.1.1" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.1.tgz#856f90b66fc39ae70affd25c1b18b581d7deee1f" + integrity sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA== dependencies: argparse "^2.0.1" - entities "~3.0.1" - linkify-it "^4.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" + entities "^4.4.0" + linkify-it "^5.0.0" + mdurl "^2.0.0" + punycode.js "^2.3.1" + uc.micro "^2.1.0" -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== +mdurl@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0" + integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w== merge-stream@^2.0.0: version "2.0.0" @@ -2307,12 +2245,12 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromatch@^4.0.4, micromatch@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== +micromatch@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" mime-db@1.52.0: @@ -2342,7 +2280,7 @@ mini-svg-data-uri@^1.2.3: resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939" integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg== -minimatch@^3.0.4, minimatch@^3.1.1: +minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -2390,26 +2328,26 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" +nanoid@^3.3.11: + version "3.3.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" + integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== + nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -node-releases@^2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" - integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== +node-releases@^2.0.36: + version "2.0.36" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.36.tgz#99fd6552aaeda9e17c4713b57a63964a2e325e9d" + integrity sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== - npm-run-path@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -2460,20 +2398,6 @@ object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.omit@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af" - integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ== - dependencies: - is-extendable "^1.0.0" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== - dependencies: - isobject "^3.0.1" - once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -2545,20 +2469,35 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: +picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== + +picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601" + integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA== + +picomatch@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589" + integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A== + pify@^2.2.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== pirates@^4.0.1: - version "4.0.6" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" - integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22" + integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA== postcss-import@^15.1.0: version "15.1.0" @@ -2570,26 +2509,25 @@ postcss-import@^15.1.0: resolve "^1.1.7" postcss-js@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2" - integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw== + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.1.0.tgz#003b63c6edde948766e40f3daf7e997ae43a5ce6" + integrity sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw== dependencies: camelcase-css "^2.0.1" -postcss-load-config@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3" - integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ== +"postcss-load-config@^4.0.2 || ^5.0 || ^6.0": + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-6.0.1.tgz#6fd7dcd8ae89badcf1b2d644489cbabf83aa8096" + integrity sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g== dependencies: - lilconfig "^3.0.0" - yaml "^2.3.4" + lilconfig "^3.1.1" -postcss-nested@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" - integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== +postcss-nested@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131" + integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ== dependencies: - postcss-selector-parser "^6.0.11" + postcss-selector-parser "^6.1.1" postcss-selector-parser@6.0.10: version "6.0.10" @@ -2599,10 +2537,10 @@ postcss-selector-parser@6.0.10: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-selector-parser@^6.0.11: - version "6.0.13" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" - integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== +postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2: + version "6.1.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de" + integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -2612,7 +2550,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.32, postcss@^8.4.5: +postcss@^8.4.27, postcss@^8.4.32: version "8.4.32" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9" integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== @@ -2621,6 +2559,15 @@ postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.32, postcss@^8.4.5: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.47, postcss@^8.4.5: + version "8.5.8" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.8.tgz#6230ecc8fb02e7a0f6982e53990937857e13f399" + integrity sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg== + dependencies: + nanoid "^3.3.11" + picocolors "^1.1.1" + source-map-js "^1.2.1" + pretty-bytes@^5.4.1: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" @@ -2640,21 +2587,21 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -prosemirror-changeset@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.1.tgz#dae94b63aec618fac7bb9061648e6e2a79988383" - integrity sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ== +prosemirror-changeset@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.4.0.tgz#8d8ea0290cb9545c298ec427ac3a8f298c39170f" + integrity sha512-LvqH2v7Q2SF6yxatuPP2e8vSUKS/L+xAU7dPDC4RMyHMhZoGDfBC74mYuyYF4gLqOEG758wajtyhNnsTkuhvng== dependencies: prosemirror-transform "^1.0.0" -prosemirror-collab@^1.3.0: +prosemirror-collab@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.3.1.tgz#0e8c91e76e009b53457eb3b3051fb68dad029a33" integrity sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ== dependencies: prosemirror-state "^1.0.0" -prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1: +prosemirror-commands@^1.0.0: version "1.5.2" resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.5.2.tgz#e94aeea52286f658cd984270de9b4c3fff580852" integrity sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ== @@ -2663,26 +2610,35 @@ prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-dropcursor@^1.5.0: - version "1.8.1" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.1.tgz#49b9fb2f583e0d0f4021ff87db825faa2be2832d" - integrity sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw== +prosemirror-commands@^1.6.2: + version "1.7.1" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.7.1.tgz#d101fef85618b1be53d5b99ea17bee5600781b38" + integrity sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.10.2" + +prosemirror-dropcursor@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.2.tgz#2ed30c4796109ddeb1cf7282372b3850528b7228" + integrity sha512-CCk6Gyx9+Tt2sbYk5NK0nB1ukHi2ryaRgadV/LvyNuO3ena1payM2z6Cg0vO1ebK8cxbzo41ku2DE5Axj1Zuiw== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" prosemirror-view "^1.1.0" -prosemirror-gapcursor@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz#5fa336b83789c6199a7341c9493587e249215cb4" - integrity sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ== +prosemirror-gapcursor@^1.3.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.4.1.tgz#da33c905fece147df577342c06f4929b25d365ee" + integrity sha512-pMdYaEnjNMSwl11yjEGtgTmLkR08m/Vl+Jj443167p9eB3HVQKhYCc4gmHVDsLPODfZfjr/MmirsdyZziXbQKw== dependencies: prosemirror-keymap "^1.0.0" prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" prosemirror-view "^1.0.0" -prosemirror-history@^1.0.0, prosemirror-history@^1.3.0: +prosemirror-history@^1.0.0: version "1.3.2" resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.3.2.tgz#ce6ad7ab9db83e761aee716f3040d74738311b15" integrity sha512-/zm0XoU/N/+u7i5zepjmZAEnpvjDtzoPWW6VmKptcAnPadN/SStsBjMImdCEbb3seiNTpveziPTIrXQbHLtU1g== @@ -2692,15 +2648,25 @@ prosemirror-history@^1.0.0, prosemirror-history@^1.3.0: prosemirror-view "^1.31.0" rope-sequence "^1.3.0" -prosemirror-inputrules@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.3.0.tgz#d43ce469ffe09a1b4cbac3f0ad367b0e4b504875" - integrity sha512-z1GRP2vhh5CihYMQYsJSa1cOwXb3SYxALXOIfAkX8nZserARtl9LiL+CEl+T+OFIsXc3mJIHKhbsmRzC0HDAXA== +prosemirror-history@^1.4.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.5.0.tgz#ee21fc5de85a1473e3e3752015ffd6d649a06859" + integrity sha512-zlzTiH01eKA55UAf1MEjtssJeHnGxO0j4K4Dpx+gnmX9n+SHNlDqI2oO1Kv1iPN5B1dm5fsljCfqKF9nFL6HRg== + dependencies: + prosemirror-state "^1.2.2" + prosemirror-transform "^1.0.0" + prosemirror-view "^1.31.0" + rope-sequence "^1.3.0" + +prosemirror-inputrules@^1.4.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.5.1.tgz#d2e935f6086e3801486b09222638f61dae89a570" + integrity sha512-7wj4uMjKaXWAQ1CDgxNzNtR9AlsuwzHfdFH1ygEHA2KHF2DOEaXl1CJfNPAKCg9qNEh4rum975QLaCiQPyY6Fw== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.0: +prosemirror-keymap@^1.0.0: version "1.2.2" resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz#14a54763a29c7b2704f561088ccf3384d14eb77e" integrity sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ== @@ -2708,48 +2674,64 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.0: prosemirror-state "^1.0.0" w3c-keyname "^2.2.0" -prosemirror-markdown@^1.10.1: - version "1.11.2" - resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.11.2.tgz#f6e529e669d11fa3eec859e93c0d2c91788d6c80" - integrity sha512-Eu5g4WPiCdqDTGhdSsG9N6ZjACQRYrsAkrF9KYfdMaCmjIApH75aVncsWYOJvEk2i1B3i8jZppv3J/tnuHGiUQ== +prosemirror-keymap@^1.2.2, prosemirror-keymap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.3.tgz#c0f6ab95f75c0b82c97e44eb6aaf29cbfc150472" + integrity sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw== dependencies: - markdown-it "^13.0.1" - prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + w3c-keyname "^2.2.0" -prosemirror-menu@^1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.4.tgz#3cfdc7c06d10f9fbd1bce29082c498bd11a0a79a" - integrity sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA== +prosemirror-markdown@^1.13.1: + version "1.13.4" + resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.13.4.tgz#4620e6a0580cd52b5fc8e352c7e04830cd4b3048" + integrity sha512-D98dm4cQ3Hs6EmjK500TdAOew4Z03EV71ajEFiWra3Upr7diytJsjF4mPV2dW+eK5uNectiRj0xFxYI9NLXDbw== + dependencies: + "@types/markdown-it" "^14.0.0" + markdown-it "^14.0.0" + prosemirror-model "^1.25.0" + +prosemirror-menu@^1.2.4: + version "1.3.0" + resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.3.0.tgz#f51e25259b91d7c35ad7b65fc0c92d838404e177" + integrity sha512-TImyPXCHPcDsSka2/lwJ6WjTASr4re/qWq1yoTTuLOqfXucwF6VcRa2LWCkM/EyTD1UO3CUwiH8qURJoWJRxwg== dependencies: crelt "^1.0.0" prosemirror-commands "^1.0.0" prosemirror-history "^1.0.0" prosemirror-state "^1.0.0" -prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.19.0, prosemirror-model@^1.8.1: +prosemirror-model@^1.0.0, prosemirror-model@^1.16.0: version "1.19.3" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.19.3.tgz#f0d55285487fefd962d0ac695f716f4ec6705006" integrity sha512-tgSnwN7BS7/UM0sSARcW+IQryx2vODKX4MI7xpqY2X+iaepJdKBPc7I4aACIsDV/LTaTjt12Z56MhDr9LsyuZQ== dependencies: orderedmap "^2.0.0" -prosemirror-schema-basic@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.2.tgz#6695f5175e4628aab179bf62e5568628b9cfe6c7" - integrity sha512-/dT4JFEGyO7QnNTe9UaKUhjDXbTNkiWTq/N4VpKaF79bBjSExVV2NXmJpcM7z/gD7mbqNjxbmWW5nf1iNSSGnw== +prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.25.0, prosemirror-model@^1.25.4: + version "1.25.4" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.4.tgz#8ebfbe29ecbee9e5e2e4048c4fe8e363fcd56e7c" + integrity sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA== dependencies: - prosemirror-model "^1.19.0" + orderedmap "^2.0.0" -prosemirror-schema-list@^1.2.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.3.0.tgz#05374702cf35a3ba5e7ec31079e355a488d52519" - integrity sha512-Hz/7gM4skaaYfRPNgr421CU4GSwotmEwBVvJh5ltGiffUJwm7C8GfN/Bc6DR1EKEp5pDKhODmdXXyi9uIsZl5A== +prosemirror-schema-basic@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.4.tgz#389ce1ec09b8a30ea9bbb92c58569cb690c2d695" + integrity sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ== + dependencies: + prosemirror-model "^1.25.0" + +prosemirror-schema-list@^1.4.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.5.1.tgz#5869c8f749e8745c394548bb11820b0feb1e32f5" + integrity sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q== dependencies: prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" prosemirror-transform "^1.7.3" -prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.1: +prosemirror-state@^1.0.0, prosemirror-state@^1.2.2: version "1.4.3" resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.3.tgz#94aecf3ffd54ec37e87aa7179d13508da181a080" integrity sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q== @@ -2758,34 +2740,49 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, pr prosemirror-transform "^1.0.0" prosemirror-view "^1.27.0" -prosemirror-tables@^1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.3.5.tgz#80f03394f5b9991f9693bcb3a90b6dba6b16254d" - integrity sha512-JSZ2cCNlApu/ObAhdPyotrjBe2cimniniTpz60YXzbL0kZ+47nEYk2LWbfKU2lKpBkUNquta2PjteoNi4YCluQ== +prosemirror-state@^1.4.3, prosemirror-state@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.4.tgz#72b5e926f9e92dcee12b62a05fcc8a2de3bf5b39" + integrity sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + prosemirror-view "^1.27.0" + +prosemirror-tables@^1.6.4: + version "1.8.5" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.8.5.tgz#104427012e5a5da1d2a38c122efee8d66bdd5104" + integrity sha512-V/0cDCsHKHe/tfWkeCmthNUcEp1IVO3p6vwN8XtwE9PZQLAZJigbw3QoraAdfJPir4NKJtNvOB8oYGKRl+t0Dw== dependencies: - prosemirror-keymap "^1.1.2" - prosemirror-model "^1.8.1" - prosemirror-state "^1.3.1" - prosemirror-transform "^1.2.1" - prosemirror-view "^1.13.3" + prosemirror-keymap "^1.2.3" + prosemirror-model "^1.25.4" + prosemirror-state "^1.4.4" + prosemirror-transform "^1.10.5" + prosemirror-view "^1.41.4" -prosemirror-trailing-node@^2.0.2: - version "2.0.7" - resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.7.tgz#ba782a7929f18bcae650b1c7082a2d10443eab19" - integrity sha512-8zcZORYj/8WEwsGo6yVCRXFMOfBo0Ub3hCUvmoWIZYfMP26WqENU0mpEP27w7mt8buZWuGrydBewr0tOArPb1Q== +prosemirror-trailing-node@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz#5bc223d4fc1e8d9145e4079ec77a932b54e19e04" + integrity sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ== dependencies: - "@remirror/core-constants" "^2.0.2" - "@remirror/core-helpers" "^3.0.0" + "@remirror/core-constants" "3.0.0" escape-string-regexp "^4.0.0" -prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.0, prosemirror-transform@^1.7.3: +prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.7.3: version "1.8.0" resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.8.0.tgz#a47c64a3c373c1bd0ff46e95be3210c8dda0cd11" integrity sha512-BaSBsIMv52F1BVVMvOmp1yzD3u65uC3HTzCBQV1WDPqJRQ2LuHKcyfn0jwqodo8sR9vVzMzZyI+Dal5W9E6a9A== dependencies: prosemirror-model "^1.0.0" -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.27.0, prosemirror-view@^1.28.2, prosemirror-view@^1.31.0: +prosemirror-transform@^1.10.2, prosemirror-transform@^1.10.5: + version "1.12.0" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.12.0.tgz#0239288d0e98d91e6af3dd269a8968466be406d7" + integrity sha512-GxboyN4AMIsoHNtz5uf2r2Ru551i5hWeCMD6E2Ib4Eogqoub0NflniaBPVQ4MrGE5yZ8JV9tUHg9qcZTTrcN4w== + dependencies: + prosemirror-model "^1.21.0" + +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0: version "1.32.5" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.32.5.tgz#8583bf2e07f4439c57a9cb6a53dcb6841815aac4" integrity sha512-OZ8JSytiOr1mlxu8XSPJSNMn3sQrycbP12Peubwsnq9xiyQk4F58u9wOPJYSXXG/uOXZQNSAITRnScZPdjEh+A== @@ -2794,6 +2791,15 @@ prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, pros prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" +prosemirror-view@^1.37.0, prosemirror-view@^1.41.4: + version "1.41.7" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.41.7.tgz#61e6f44ac160795c913ead92a282247df9d468f6" + integrity sha512-jUwKNCEIGiqdvhlS91/2QAg21e4dfU5bH2iwmSDQeosXJgKF7smG0YSplOWK0cjSNgIqXe7VXqo7EIfUFJdt3w== + dependencies: + prosemirror-model "^1.20.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" @@ -2807,6 +2813,11 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" +punycode.js@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7" + integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA== + punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -2904,12 +2915,12 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== -resolve@^1.1.7, resolve@^1.22.2: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== +resolve@^1.1.7, resolve@^1.22.8: + version "1.22.11" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262" + integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ== dependencies: - is-core-module "^2.13.0" + is-core-module "^2.16.1" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -2930,9 +2941,9 @@ restore-cursor@^2.0.0: signal-exit "^3.0.2" reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f" + integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw== rimraf@^3.0.0: version "3.0.2" @@ -3043,6 +3054,11 @@ source-map-js@^1.0.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + sshpk@^1.14.1: version "1.17.0" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" @@ -3124,17 +3140,17 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== -sucrase@^3.32.0: - version "3.34.0" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.34.0.tgz#1e0e2d8fcf07f8b9c3569067d92fbd8690fb576f" - integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw== +sucrase@^3.35.0: + version "3.35.1" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.1.tgz#4619ea50393fe8bd0ae5071c26abd9b2e346bfe1" + integrity sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw== dependencies: "@jridgewell/gen-mapping" "^0.3.2" commander "^4.0.0" - glob "7.1.6" lines-and-columns "^1.1.6" mz "^2.7.0" pirates "^4.0.1" + tinyglobby "^0.2.11" ts-interface-checker "^0.1.9" supports-color@^2.0.0: @@ -3167,32 +3183,32 @@ symbol-observable@^1.1.0: integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== tailwindcss@^3.0.12: - version "3.3.6" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.6.tgz#4dd7986bf4902ad385d90d45fd4b2fa5fab26d5f" - integrity sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw== + version "3.4.19" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.19.tgz#af2a0a4ae302d52ebe078b6775e799e132500ee2" + integrity sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" - chokidar "^3.5.3" + chokidar "^3.6.0" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.3.0" + fast-glob "^3.3.2" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.19.1" - lilconfig "^2.1.0" - micromatch "^4.0.5" + jiti "^1.21.7" + lilconfig "^3.1.3" + micromatch "^4.0.8" normalize-path "^3.0.0" object-hash "^3.0.0" - picocolors "^1.0.0" - postcss "^8.4.23" + picocolors "^1.1.1" + postcss "^8.4.47" postcss-import "^15.1.0" postcss-js "^4.0.1" - postcss-load-config "^4.0.1" - postcss-nested "^6.0.1" - postcss-selector-parser "^6.0.11" - resolve "^1.22.2" - sucrase "^3.32.0" + postcss-load-config "^4.0.2 || ^5.0 || ^6.0" + postcss-nested "^6.2.0" + postcss-selector-parser "^6.1.2" + resolve "^1.22.8" + sucrase "^3.35.0" thenify-all@^1.0.0: version "1.6.0" @@ -3208,16 +3224,19 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -throttle-debounce@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb" - integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== - throttleit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g== +tinyglobby@^0.2.11: + version "0.2.15" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2" + integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ== + dependencies: + fdir "^6.5.0" + picomatch "^4.0.3" + tippy.js@^6.3.7: version "6.3.7" resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c" @@ -3276,20 +3295,15 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== -type-fest@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" - integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== +uc.micro@^2.0.0, uc.micro@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee" + integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A== universalify@^0.2.0: version "0.2.0" @@ -3306,13 +3320,13 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== -update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== +update-browserslist-db@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d" + integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w== dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" + escalade "^3.2.0" + picocolors "^1.1.1" url-parse@^1.5.3: version "1.5.10" @@ -3438,11 +3452,6 @@ xmlhttprequest-ssl@~2.0.0: resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== -yaml@^2.3.4: - version "2.3.4" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2" - integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== - yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" From e0201a866dc16bfe7712d802f5a825170754df1e Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Wed, 1 Apr 2026 12:35:35 -0400 Subject: [PATCH 12/16] chore: update pyproject and CI --- .github/workflows/pytest.yaml | 54 +++++++++++++---------------------- pyproject.toml | 9 ++---- 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 33a06394..e4ffbe3b 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -2,23 +2,24 @@ name: Pytest CI on: push: - branches: [ version-14, version-15 ] + branches: + - version-14 + - version-15 pull_request: - branches: [ version-14, version-15 ] -env: - BRANCH_NAME: ${{ github.base_ref || github.ref_name }} + +permissions: + contents: write + checks: write + issues: write + pull-requests: write jobs: tests: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] - fail-fast: false name: Server + runs-on: ubuntu-latest services: - mysql: + mariadb: image: mariadb:10.6 env: MYSQL_ALLOW_EMPTY_PASSWORD: YES @@ -29,25 +30,25 @@ jobs: steps: - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 check-latest: true - cache: 'yarn' # Replaces `Get yarn cache directory path` and `yarn-cache` steps + cache: 'yarn' - name: Add to Hosts run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }} @@ -55,42 +56,27 @@ jobs: ${{ runner.os }}-pip- ${{ runner.os }}- - - name: Cache node modules - uses: actions/cache@v4 - env: - cache-name: cache-node-modules - with: - path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - name: Install JS Dependencies run: yarn --prefer-offline - name: Install App Dependencies - run: bash ${{github.workspace}}/.github/helper/install_dependencies.sh + run: bash ${{ github.workspace }}/.github/helper/install_dependencies.sh - name: Install Bench Site and Apps env: MYSQL_HOST: 'localhost' MYSQL_PWD: 'admin' - BRANCH_NAME: ${{ env.BRANCH_NAME}} - run: | - bash ${{ github.workspace }}/.github/helper/install.sh + run: bash ${{ github.workspace }}/.github/helper/install.sh - name: Run Tests working-directory: /home/runner/frappe-bench run: | source env/bin/activate cd apps/check_run - poetry install pytest check_run/tests/ --disable-warnings -s | tee pytest-coverage.txt - name: Pytest coverage comment uses: MishaKav/pytest-coverage-comment@main with: pytest-coverage-path: /home/runner/frappe-bench/apps/check_run/pytest-coverage.txt - pytest-xml-coverage-path: /home/runner/frappe-bench/apps/check_run/coverage.xml + junitxml-path: /home/runner/frappe-bench/apps/check_run/coverage.xml diff --git a/pyproject.toml b/pyproject.toml index 8f67ca20..48a0f048 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,12 +14,6 @@ python = "^3.10" atnacha = { git = "https://github.com/AgriTheory/atnacha.git" } pdfplumber = "*" -[tool.poetry.group.dev.dependencies] -pytest = "^8.2.2" -pytest-cov = "^5.0.0" -pytest-order = "^1.2.1" -mypy = "^1.10.0" - [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" @@ -33,12 +27,13 @@ hrms = ">=15.0.0,<16.0.0" pytest = "~=8.2.2" pytest-cov = "~=5.0.0" pytest-order = "~=1.2.1" +test_utils = "@git+https://github.com/agritheory/test_utils.git#egg=test_utils" [tool.codespell] skip = "CHANGELOG.md" [tool.pytest.ini_options] -addopts = "--cov=check_run --cov-report=xml -s --disable-warnings" +addopts = "-s --disable-warnings" [tool.black] line-length = 99 From e0dce5ce206138614935ffcf715567106951afaf Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Wed, 1 Apr 2026 12:54:12 -0400 Subject: [PATCH 13/16] ci: resolve branch name correctly --- .github/helper/install.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 34baf40f..46f914c7 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -26,8 +26,14 @@ mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_si mysql --host 127.0.0.1 --port 3306 -u root -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'root'" # match site_cofig mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES" -echo BRANCH_NAME: "${BRANCH_NAME}" -git clone https://github.com/frappe/frappe --branch ${BRANCH_NAME} +if [ "${GITHUB_EVENT_NAME}" = 'pull_request' ]; then + BRANCH_NAME="${GITHUB_BASE_REF}" +else + BRANCH_NAME="${GITHUB_REF_NAME}" +fi +echo "BRANCH_NAME: ${BRANCH_NAME}" + +git clone https://github.com/frappe/frappe --branch "${BRANCH_NAME}" bench init frappe-bench --frappe-path ~/frappe --python "$(which python)" --skip-assets --ignore-exist mkdir ~/frappe-bench/sites/test_site @@ -40,8 +46,8 @@ sed -i 's/schedule:/# schedule:/g' Procfile sed -i 's/socketio:/# socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile -bench get-app erpnext https://github.com/frappe/erpnext --branch ${BRANCH_NAME} --resolve-deps --skip-assets -bench get-app hrms https://github.com/frappe/hrms --branch ${BRANCH_NAME} --skip-assets +bench get-app erpnext https://github.com/frappe/erpnext --branch "${BRANCH_NAME}" --resolve-deps --skip-assets +bench get-app hrms https://github.com/frappe/hrms --branch "${BRANCH_NAME}" --skip-assets bench get-app check_run "${GITHUB_WORKSPACE}" --skip-assets printf '%s\n' 'frappe' 'erpnext' 'hrms' 'check_run' > ~/frappe-bench/sites/apps.txt From 547f765b54b9adef414d152d113b696582119cd2 Mon Sep 17 00:00:00 2001 From: Tyler Matteson Date: Fri, 3 Apr 2026 14:26:09 -0400 Subject: [PATCH 14/16] fix: correct outstanding amount in PE references --- .pre-commit-config.yaml | 2 +- check_run/overrides/payment_entry.py | 34 +++++++++++++++++----------- check_run/tests/test_tax_payable.py | 21 ++++++++++------- docs/sales_tax_payable.md | 8 +++++-- 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 237555f8..390f587c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,7 @@ repos: additional_dependencies: ['flake8-bugbear'] - repo: https://github.com/agritheory/test_utils - rev: v1.20.4 + rev: v1.21.1 hooks: - id: update_pre_commit_config - id: validate_frappe_project diff --git a/check_run/overrides/payment_entry.py b/check_run/overrides/payment_entry.py index f61c4e7b..f14b1308 100644 --- a/check_run/overrides/payment_entry.py +++ b/check_run/overrides/payment_entry.py @@ -231,20 +231,28 @@ def validate_allocated_amount_with_latest_data(self): METHOD: validate_allocated_amount_with_latest_data """ if self.references: - unique_vouchers = {(x.reference_doctype, x.reference_name) for x in self.references} + unique_vouchers = { + (x.reference_doctype, x.reference_name) + for x in self.references + if x.reference_doctype != "Sales Taxes and Charges" + } vouchers = [frappe._dict({"voucher_type": x[0], "voucher_no": x[1]}) for x in unique_vouchers] - latest_references = get_outstanding_reference_documents( - { - "posting_date": self.posting_date, - "company": self.company, - "party_type": self.party_type, - "payment_type": self.payment_type, - "party": self.party, - "party_account": self.paid_from if self.payment_type == "Receive" else self.paid_to, - "get_outstanding_invoices": True, - "get_orders_to_be_billed": True, - "vouchers": vouchers, - } + latest_references = ( + get_outstanding_reference_documents( + { + "posting_date": self.posting_date, + "company": self.company, + "party_type": self.party_type, + "payment_type": self.payment_type, + "party": self.party, + "party_account": self.paid_from if self.payment_type == "Receive" else self.paid_to, + "get_outstanding_invoices": True, + "get_orders_to_be_billed": True, + "vouchers": vouchers, + } + ) + if vouchers + else [] ) # Group latest_references by (voucher_type, voucher_no) diff --git a/check_run/tests/test_tax_payable.py b/check_run/tests/test_tax_payable.py index 6601e4ac..ed396ba2 100644 --- a/check_run/tests/test_tax_payable.py +++ b/check_run/tests/test_tax_payable.py @@ -49,7 +49,7 @@ def tax_payable_cr(): return cr -@pytest.mark.order(30) +@pytest.mark.order(40) def test_tax_payable_gl(): """ | Account | Debit | Credit | Party | @@ -83,7 +83,7 @@ def test_tax_payable_gl(): assert gl1.party == "Massachusetts Department of Revenue" -@pytest.mark.order(31) +@pytest.mark.order(41) def test_tax_payable_check_run(tax_payable_cr): """ Processing the Sales Tax Payable Check Run creates a single Payment Entry @@ -104,7 +104,7 @@ def test_tax_payable_check_run(tax_payable_cr): assert all(t.get("payment_entry") == pe_name for t in processed) -@pytest.mark.order(32) +@pytest.mark.order(42) def test_tax_payable_due_date_from_supplier_terms(): """ Verify that the due_date on a Sales Taxes and Charges row is computed from @@ -137,7 +137,7 @@ def test_tax_payable_due_date_from_supplier_terms(): ) -@pytest.mark.order(40) +@pytest.mark.order(43) def test_sales_invoice_return_reduces_payable(): """ Verify that submitting a return Sales Invoice reduces the outstanding_amount @@ -193,7 +193,7 @@ def test_sales_invoice_return_reduces_payable(): ), f"Outstanding should be 0 after full return, got {reduced_outstanding}" -@pytest.mark.order(50) +@pytest.mark.order(44) def test_return_after_payable_remitted(): """ Verify that creating a return SI after the tax payable has already been @@ -263,7 +263,12 @@ def test_return_after_payable_remitted(): }, ) pe.save() + frappe.clear_messages() pe.submit() + assert not any("No outstanding" in str(m) for m in frappe.get_message_log()), ( + "validate_allocated_amount_with_latest_data should not emit a 'No outstanding' message " + f"for a Sales Taxes and Charges-only Payment Entry: {frappe.get_message_log()}" + ) outstanding_after_payment = flt( frappe.db.get_value("Sales Taxes and Charges", tax_row_name, "outstanding_amount") @@ -299,7 +304,7 @@ def test_return_after_payable_remitted(): ), "Original outstanding should remain 0 after the return (it was already paid)" -@pytest.mark.order(55) +@pytest.mark.order(45) def test_reversed_payable_in_check_run(): """ Verify that a return SI's negative outstanding tax row (created by @@ -337,7 +342,7 @@ def test_reversed_payable_in_check_run(): assert t.get("party") == "Massachusetts Department of Revenue" -@pytest.mark.order(60) +@pytest.mark.order(46) def test_multiple_tax_authorities_single_invoice(): """ Verify that an SI with tax rows pointing to two different tax authorities @@ -416,7 +421,7 @@ def test_multiple_tax_authorities_single_invoice(): assert this_si_vt, f"SI {si.name} should appear in Check Run for Vermont Department of Taxes" -@pytest.mark.order(70) +@pytest.mark.order(47) def test_accounting_dimensions_in_tax_gl_entries(): """ Verify that the cost_center from the Sales Taxes and Charges row flows diff --git a/docs/sales_tax_payable.md b/docs/sales_tax_payable.md index 362be8e2..6dd78e94 100644 --- a/docs/sales_tax_payable.md +++ b/docs/sales_tax_payable.md @@ -4,7 +4,7 @@ For license information, please see license.txt--> # Sales Tax Payable
- Tyler Matteson 2024-04-01 + Tyler Matteson 2026-04-01
@@ -25,4 +25,8 @@ When a sales invoice is returned after the tax liability has already been paid v - The original invoice's tax row outstanding amount remains `0` (it was already remitted). - The return invoice's tax row carries a **negative** outstanding amount equal to the original tax, representing the credit owed back from the tax authority. -This credit row will appear in the next Check Run (with **Allow stand-alone debit notes?** set to **Yes**), where it can be selected to net against other tax remittances or processed as a standalone refund. \ No newline at end of file +This credit row will appear in the next Check Run (with **Allow stand-alone debit notes?** set to **Yes**), where it can be selected to net against other tax remittances or processed as a standalone refund. + +## Supported Remittance Path + +Tax remittance is only supported through the Check Run workflow. Using the standard **Create → Payment Entry** button on a Sales Invoice that has tax payable rows will produce a Payment Entry for the receivable rather than the Sales tax Payable amount. \ No newline at end of file From 14ecde4458149696ad5ea0ffd134d3fa74260f0b Mon Sep 17 00:00:00 2001 From: Heather Kusmierz Date: Sat, 4 Apr 2026 10:38:40 -0400 Subject: [PATCH 15/16] fix: SI outstanding amount bug, stc union query order --- .../check_run/doctype/check_run/check_run.py | 4 +- check_run/overrides/sales_invoice.py | 4 ++ .../js/check_run/ModeOfPaymentSummary.vue | 1 - check_run/tests/test_tax_payable.py | 58 +++++++++++++------ 4 files changed, 47 insertions(+), 20 deletions(-) diff --git a/check_run/check_run/doctype/check_run/check_run.py b/check_run/check_run/doctype/check_run/check_run.py index 624ac42e..a7037d6e 100644 --- a/check_run/check_run/doctype/check_run/check_run.py +++ b/check_run/check_run/doctype/check_run/check_run.py @@ -847,7 +847,7 @@ def get_entries(doc: CheckRun | str) -> dict: .where(journal_entries.docstatus == 1) .where(je_accounts.account == pay_to_account) .where(journal_entries.due_date <= end_date) - .where((journal_entries.name).notin(sub_q)) # codespell:ignore + .where((journal_entries.name).notin(sub_q)) ) # build Sales Taxes and Charges query @@ -862,8 +862,8 @@ def get_entries(doc: CheckRun | str) -> dict: .select( ConstantColumn("Sales Invoice").as_("doctype"), sales_taxes.party_type, - sales_taxes.parent.as_("ref_number"), sales_taxes.name, + sales_taxes.parent.as_("ref_number"), sales_taxes.party, (sales_taxes.party).as_("party_name"), (sales_taxes.tax_amount_after_discount_amount).as_("amount"), diff --git a/check_run/overrides/sales_invoice.py b/check_run/overrides/sales_invoice.py index b3a0c8d0..35f9c91a 100644 --- a/check_run/overrides/sales_invoice.py +++ b/check_run/overrides/sales_invoice.py @@ -99,6 +99,10 @@ def make_tax_gl_entries(self, gl_entries): "cost_center": tax.cost_center, "party_type": tax.party_type if is_payable_account else None, "party": tax.party if is_payable_account else None, + "voucher_type": "Sales Taxes and Charges" if is_payable_account else None, + "voucher_no": tax.name if is_payable_account else None, + "against_voucher": tax.name if is_payable_account else None, + "against_voucher_type": "Sales Taxes and Charges" if is_payable_account else None, **dimensions, }, account_currency, diff --git a/check_run/public/js/check_run/ModeOfPaymentSummary.vue b/check_run/public/js/check_run/ModeOfPaymentSummary.vue index 21cdeac4..134bbd22 100644 --- a/check_run/public/js/check_run/ModeOfPaymentSummary.vue +++ b/check_run/public/js/check_run/ModeOfPaymentSummary.vue @@ -30,7 +30,6 @@ function format_currency(v2, currency, decimals) { function calculate_totals() { let modes_of_payments = aggregate(props.transactions, 'mode_of_payment', 'amount', 'pay') - console.log(modes_of_payments) let results = [] if (!(frm.value.doc && frm.value.settings)) { return diff --git a/check_run/tests/test_tax_payable.py b/check_run/tests/test_tax_payable.py index ed396ba2..f49c4400 100644 --- a/check_run/tests/test_tax_payable.py +++ b/check_run/tests/test_tax_payable.py @@ -49,6 +49,38 @@ def tax_payable_cr(): return cr +def tax_gl_query(si_name, tax_row_names, account, is_cancelled=0): + """ + Helper function to find GL Entries for Sales Taxes and Charges in given Sales Invoice. + + :param si_name: str; name of the parent Sales Invoice taxes are for + :param tax_row_names: str | list[str]; names of the row in Sales Taxes and Charges + :param account: str; the tax row's account head + :param is_cancelled: int (0|1); whether the GL Entry is cancelled or not + :return: query results + """ + gl = frappe.qb.DocType("GL Entry") + si = frappe.qb.DocType("Sales Invoice") + stc = frappe.qb.DocType("Sales Taxes and Charges") + + if isinstance(tax_row_names, str): + tax_row_names = [tax_row_names] + + q = ( + frappe.qb.from_(gl) + .inner_join(stc) + .on(gl.voucher_no == stc.name) + .inner_join(si) + .on(stc.parent == si.name) + .select(gl.name) + .where(si.name == si_name) + .where(stc.name.isin(tax_row_names)) + .where(gl.account == account) + .where(gl.is_cancelled == is_cancelled) + ) + return q.run(as_dict=True, pluck="name") + + @pytest.mark.order(40) def test_tax_payable_gl(): """ @@ -76,9 +108,9 @@ def test_tax_payable_gl(): expected_due_date = get_due_date(doc.posting_date, ma_row.party_type, ma_row.party, doc.company) assert ma_row.due_date == getdate(expected_due_date or doc.posting_date) - gl1 = frappe.get_doc( - "GL Entry", {"voucher_no": doc.name, "account": "2320 - Sales Tax Payable - CFC"} - ) + gl_entries = tax_gl_query(si_name, ma_row.name, "2320 - Sales Tax Payable - CFC") + assert len(gl_entries) == 1, f"Expected 1 GL entry for tax payable, got {len(gl_entries)}" + gl1 = frappe.get_doc("GL Entry", gl_entries[0]) assert flt(gl1.credit, precision) == flt(doc.total_taxes_and_charges, precision) assert gl1.party == "Massachusetts Department of Revenue" @@ -378,15 +410,12 @@ def test_multiple_tax_authorities_single_invoice(): si.save() si.submit() - gl_entries = frappe.get_all( - "GL Entry", - {"voucher_no": si.name, "account": "2320 - Sales Tax Payable - CFC", "is_cancelled": 0}, - ["name", "credit", "party"], - ) + tax_row_names = [tax.name for tax in si.taxes] + gl_entries = tax_gl_query(si.name, tax_row_names, "2320 - Sales Tax Payable - CFC") assert ( len(gl_entries) == 2 ), f"Expected 2 GL entries for tax payable (one per authority), got {len(gl_entries)}" - parties = {g.party for g in gl_entries} + parties = {frappe.get_value("GL Entry", gl_name, "party") for gl_name in gl_entries} assert "Massachusetts Department of Revenue" in parties assert "Vermont Department of Taxes" in parties @@ -455,14 +484,9 @@ def test_accounting_dimensions_in_tax_gl_entries(): si.submit() tax_row = next(row for row in si.taxes if row.party == "Massachusetts Department of Revenue") - gl_entry = frappe.get_doc( - "GL Entry", - { - "voucher_no": si.name, - "account": "2320 - Sales Tax Payable - CFC", - "is_cancelled": 0, - }, - ) + gl_entries = tax_gl_query(si.name, tax_row.name, "2320 - Sales Tax Payable - CFC") + assert len(gl_entries) == 1, f"Expected 1 GL entry for tax payable, got {len(gl_entries)}" + gl_entry = frappe.get_doc("GL Entry", gl_entries[0]) assert gl_entry.cost_center == tax_row.cost_center, ( f"GL Entry cost_center '{gl_entry.cost_center}' should match " f"tax row cost_center '{tax_row.cost_center}'" From de25790c12ac145593f0d59c839a004ce0071b52 Mon Sep 17 00:00:00 2001 From: Heather Kusmierz Date: Sat, 4 Apr 2026 11:29:06 -0400 Subject: [PATCH 16/16] test: t-account amount --- check_run/tests/test_sales_tax_remittance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_run/tests/test_sales_tax_remittance.py b/check_run/tests/test_sales_tax_remittance.py index af046712..bbcae66a 100644 --- a/check_run/tests/test_sales_tax_remittance.py +++ b/check_run/tests/test_sales_tax_remittance.py @@ -275,7 +275,7 @@ def test_remittance_report_return_shows_credit(): | Account | Debit | Credit | Party | | ---------------------- | --------:| --------:| --------------------------- | | 2320 Sales Tax Payable | $7.80 | | Vermont Department of Taxes | - | Sales | $7.80 | | | + | Sales | $130.00 | | | | Accounts Receivable | | $138.78 | Downtown Deli | """ posting_date = datetime.date(year, 11, 20)