nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-25 20:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2026-06-24 15:08:04 +05:30
parent 66b28cf456
commit 267086153b
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -757,11 +757,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
"modified": "2026-06-15 18:26:50.778723",
=======
"modified": "2026-06-24 12:59:41.868865",
>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",

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

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

4
erpnext/patches.txt
View File

@@ -484,8 +484,4 @@ 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.migrate_address_contact_custom_fields
erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
<<<<<<< HEAD
=======
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)