mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-29 18:04:46 +00:00
refactor: checkbox for pcv controller
(cherry picked from commit 4888461be2)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/accounts_settings/accounts_settings.py
This commit is contained in:
@@ -75,6 +75,7 @@
|
|||||||
"period_closing_settings_section",
|
"period_closing_settings_section",
|
||||||
"acc_frozen_upto",
|
"acc_frozen_upto",
|
||||||
"ignore_account_closing_balance",
|
"ignore_account_closing_balance",
|
||||||
|
"use_legacy_controller_for_pcv",
|
||||||
"column_break_25",
|
"column_break_25",
|
||||||
"frozen_accounts_modifier",
|
"frozen_accounts_modifier",
|
||||||
"tab_break_dpet",
|
"tab_break_dpet",
|
||||||
@@ -629,6 +630,21 @@
|
|||||||
"fieldname": "fetch_valuation_rate_for_internal_transaction",
|
"fieldname": "fetch_valuation_rate_for_internal_transaction",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Fetch Valuation Rate for Internal Transaction"
|
"label": "Fetch Valuation Rate for Internal Transaction"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "use_legacy_budget_controller",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Use Legacy Budget Controller"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "use_legacy_controller_for_pcv",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Use Legacy Controller For Period Closing Voucher"
|
||||||
|
>>>>>>> 4888461be2 (refactor: checkbox for pcv controller)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
@@ -636,7 +652,11 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2025-07-18 13:56:47.192437",
|
"modified": "2025-07-18 13:56:47.192437",
|
||||||
|
=======
|
||||||
|
"modified": "2025-10-01 15:17:47.168354",
|
||||||
|
>>>>>>> 4888461be2 (refactor: checkbox for pcv controller)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Accounts Settings",
|
"name": "Accounts Settings",
|
||||||
|
|||||||
@@ -73,6 +73,11 @@ class AccountsSettings(Document):
|
|||||||
submit_journal_entries: DF.Check
|
submit_journal_entries: DF.Check
|
||||||
unlink_advance_payment_on_cancelation_of_order: DF.Check
|
unlink_advance_payment_on_cancelation_of_order: DF.Check
|
||||||
unlink_payment_on_cancellation_of_invoice: DF.Check
|
unlink_payment_on_cancellation_of_invoice: DF.Check
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
use_legacy_budget_controller: DF.Check
|
||||||
|
use_legacy_controller_for_pcv: DF.Check
|
||||||
|
>>>>>>> 4888461be2 (refactor: checkbox for pcv controller)
|
||||||
# end: auto-generated types
|
# end: auto-generated types
|
||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user