mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-30 18:34:48 +00:00
refactor: configurable fetch method for AR / AP report
(cherry picked from commit 66fd639b52)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
This commit is contained in:
@@ -77,9 +77,12 @@
|
|||||||
"reports_tab",
|
"reports_tab",
|
||||||
"remarks_section",
|
"remarks_section",
|
||||||
"general_ledger_remarks_length",
|
"general_ledger_remarks_length",
|
||||||
"ignore_is_opening_check_for_reporting",
|
|
||||||
"column_break_lvjk",
|
"column_break_lvjk",
|
||||||
"receivable_payable_remarks_length",
|
"receivable_payable_remarks_length",
|
||||||
|
"accounts_receivable_payable_tuning_section",
|
||||||
|
"receivable_payable_fetch_method",
|
||||||
|
"legacy_section",
|
||||||
|
"ignore_is_opening_check_for_reporting",
|
||||||
"payment_request_settings",
|
"payment_request_settings",
|
||||||
"create_pr_in_draft_status"
|
"create_pr_in_draft_status"
|
||||||
],
|
],
|
||||||
@@ -532,6 +535,37 @@
|
|||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Posting Date Inheritance for Exchange Gain / Loss",
|
"label": "Posting Date Inheritance for Exchange Gain / Loss",
|
||||||
"options": "Invoice\nPayment\nReconciliation Date"
|
"options": "Invoice\nPayment\nReconciliation Date"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_xrnd",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"description": "If enabled, Sales Invoice will be generated instead of POS Invoice in POS Transactions for real-time update of G/L and Stock Ledger.",
|
||||||
|
"fieldname": "use_sales_invoice_in_pos",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Use Sales Invoice"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "Buffered Cursor",
|
||||||
|
"fieldname": "receivable_payable_fetch_method",
|
||||||
|
"fieldtype": "Select",
|
||||||
|
"label": "Data Fetch Method",
|
||||||
|
"options": "Buffered Cursor\nUnBuffered Cursor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "accounts_receivable_payable_tuning_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Accounts Receivable / Payable Tuning"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "legacy_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Legacy Fields"
|
||||||
|
>>>>>>> 66fd639b52 (refactor: configurable fetch method for AR / AP report)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
@@ -539,7 +573,11 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2025-01-23 13:15:44.077853",
|
"modified": "2025-01-23 13:15:44.077853",
|
||||||
|
=======
|
||||||
|
"modified": "2025-05-05 12:29:38.302027",
|
||||||
|
>>>>>>> 66fd639b52 (refactor: configurable fetch method for AR / AP report)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Accounts Settings",
|
"name": "Accounts Settings",
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ class AccountsSettings(Document):
|
|||||||
merge_similar_account_heads: DF.Check
|
merge_similar_account_heads: DF.Check
|
||||||
over_billing_allowance: DF.Currency
|
over_billing_allowance: DF.Currency
|
||||||
post_change_gl_entries: DF.Check
|
post_change_gl_entries: DF.Check
|
||||||
|
receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"]
|
||||||
receivable_payable_remarks_length: DF.Int
|
receivable_payable_remarks_length: DF.Int
|
||||||
reconciliation_queue_size: DF.Int
|
reconciliation_queue_size: DF.Int
|
||||||
role_allowed_to_over_bill: DF.Link | None
|
role_allowed_to_over_bill: DF.Link | None
|
||||||
|
|||||||
Reference in New Issue
Block a user