nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: patch, display depends on and json changes

Browse Source 
(cherry picked from commit 3da7eefebb)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt
(cherry picked from commit c33d7e5d7b)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt
This commit is contained in:
ruthra kumar
2026-06-24 13:01:42 +05:30
committed by Mergify
parent e71b066eec
commit 570c67bb34
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -633,6 +633,7 @@
"label": "Show Party Balance" "label": "Show Party Balance"
======= =======
"default": "3600", "default": "3600",
"depends_on": "eval: !doc.use_legacy_controller_for_pcv",
"description": "Timeout (in seconds) for each background job enqueued by Process Period Closing Voucher", "description": "Timeout (in seconds) for each background job enqueued by Process Period Closing Voucher",
"fieldname": "pcv_job_timeout", "fieldname": "pcv_job_timeout",
"fieldtype": "Int", "fieldtype": "Int",
@@ -780,7 +781,15 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-06-15 18:26:50.778723", "modified": "2026-06-15 18:26:50.778723",
=======
<<<<<<< HEAD
"modified": "2026-05-18 12:16:33.679345",
=======
"modified": "2026-06-24 12:59:41.868865",
>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
>>>>>>> c33d7e5d7b (refactor: patch, display depends on and json changes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

9
erpnext/accounts/doctype/accounts_settings/accounts_settings.py
View File

@@ -90,6 +90,15 @@ class AccountsSettings(Document):
make_payment_via_journal_entry: DF.Check make_payment_via_journal_entry: DF.Check
merge_similar_account_heads: DF.Check merge_similar_account_heads: DF.Check
over_billing_allowance: DF.Currency over_billing_allowance: DF.Currency
<<<<<<< HEAD
=======
<<<<<<< HEAD
post_change_gl_entries: DF.Check
=======
pcv_job_timeout: DF.Int
preview_mode: DF.Check
>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
>>>>>>> c33d7e5d7b (refactor: patch, display depends on and json changes)
receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"] 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

15
erpnext/patches.txt
View File

@@ -483,4 +483,19 @@ erpnext.patches.v16_0.fix_titles
erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates
erpnext.patches.v16_0.clear_procedures_from_receivable_report erpnext.patches.v16_0.clear_procedures_from_receivable_report
erpnext.patches.v16_0.migrate_address_contact_custom_fields erpnext.patches.v16_0.migrate_address_contact_custom_fields
<<<<<<< HEAD
erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
=======
<<<<<<< HEAD
erpnext.patches.v15_0.set_main_item_code_in_material_request_plan_item
erpnext.patches.v16_0.set_posting_datetime_for_sabb_and_drop_indexes
=======
erpnext.patches.v16_0.rename_secondary_item_type_field
erpnext.patches.v16_0.submit_existing_product_bundles #1
erpnext.patches.v16_0.migrate_subscription_generate_invoice_at
erpnext.patches.v16_0.rename_subscription_billing_period_fields
erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
erpnext.patches.v16_0.set_default_close_opportunity_after_days
execute:frappe.db.set_single_value("Accounts Settings", "pcv_job_timeout", 3600)
>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
>>>>>>> c33d7e5d7b (refactor: patch, display depends on and json changes)