nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: removed checkbox

Browse Source
This commit is contained in:
Khushi Rawat
2024-10-21 04:40:55 +05:30
parent 1e60e8db03
commit de47f3aa00
4 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@
"post_change_gl_entries", "post_change_gl_entries",
"assets_tab", "assets_tab",
"asset_settings_section", "asset_settings_section",
"calculate_depr_using_total_days",
"calculate_daily_depreciation_using", "calculate_daily_depreciation_using",
"column_break_gjcc", "column_break_gjcc",
"book_asset_depreciation_entry_automatically", "book_asset_depreciation_entry_automatically",
@@ -472,13 +471,6 @@
"fieldname": "column_break_gjcc", "fieldname": "column_break_gjcc",
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{
"default": "0",
"description": "Enable this option to calculate daily depreciation by considering the total number of days in the entire depreciation period, (including leap years) while using daily pro-rata based depreciation",
"fieldname": "calculate_depr_using_total_days",
"fieldtype": "Check",
"label": "Calculate daily depreciation using total days in depreciation period"
},
{ {
"description": "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state.", "description": "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state.",
"fieldname": "payment_request_settings", "fieldname": "payment_request_settings",
@@ -493,6 +485,7 @@
}, },
{ {
"default": "Total years in depreciation period", "default": "Total years in depreciation period",
"description": "This field lets you select your preferred method for calculating pro rata depreciation. Each approach has different implication. For detailed explanations, please refer to the <a href=\"https://docs.erpnext.com/docs/user/manual/en/pro-rata-based-depreciation-for-slm\" target=\"_blank\"><u>Documentation</u></a>.",
"fieldname": "calculate_daily_depreciation_using", "fieldname": "calculate_daily_depreciation_using",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Calculate Daily Pro-rata Depreciation Using", "label": "Calculate Daily Pro-rata Depreciation Using",
@@ -504,7 +497,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2024-10-16 15:41:03.548766", "modified": "2024-10-21 04:29:02.556355",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

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

@@ -36,7 +36,6 @@ class AccountsSettings(Document):
calculate_daily_depreciation_using: DF.Literal[ calculate_daily_depreciation_using: DF.Literal[
"Total days in depreciation period", "Total years in depreciation period" "Total days in depreciation period", "Total years in depreciation period"
] ]
calculate_depr_using_total_days: DF.Check
check_supplier_invoice_uniqueness: DF.Check check_supplier_invoice_uniqueness: DF.Check
create_pr_in_draft_status: DF.Check create_pr_in_draft_status: DF.Check
credit_controller: DF.Link | None credit_controller: DF.Link | None

1
erpnext/patches.txt
View File

@@ -384,4 +384,3 @@ erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
erpnext.patches.v15_0.link_purchase_item_to_asset_doc erpnext.patches.v15_0.link_purchase_item_to_asset_doc
erpnext.patches.v15_0.migrate_to_utm_analytics erpnext.patches.v15_0.migrate_to_utm_analytics
erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
erpnext.patches.v15_0.update_checkbox_to_select #1

13
erpnext/patches/v15_0/update_checkbox_to_select.py
View File

@@ -1,13 +0,0 @@
import frappe
from frappe.utils import cint
def execute():
if cint(frappe.db.get_single_value("Accounts Settings", "calculate_depr_using_total_days")):
frappe.db.set_single_value(
"Accounts Settings", "calculate_daily_depreciation_using", "Total days in depreciation period"
)
else:
frappe.db.set_single_value(
"Accounts Settings", "calculate_daily_depreciation_using", "Total years in depreciation period"
)