Merge pull request #42588 from ruthra-kumar/round_off_account_for_opening

refactor: separate round off account for opening
This commit is contained in:
ruthra kumar
2024-09-06 10:10:23 +05:30
committed by GitHub
11 changed files with 260 additions and 16 deletions

View File

@@ -252,6 +252,7 @@ erpnext.company.setup_queries = function (frm) {
["default_expense_account", { root_type: "Expense" }],
["default_income_account", { root_type: "Income" }],
["round_off_account", { root_type: "Expense" }],
["round_off_for_opening", { root_type: "Liability", account_type: "Round Off for Opening" }],
["write_off_account", { root_type: "Expense" }],
["default_deferred_expense_account", {}],
["default_deferred_revenue_account", {}],

View File

@@ -49,6 +49,7 @@
"default_cash_account",
"default_receivable_account",
"round_off_account",
"round_off_for_opening",
"round_off_cost_center",
"write_off_account",
"exchange_gain_loss_account",
@@ -785,6 +786,12 @@
"fieldtype": "Link",
"label": "Default Operating Cost Account",
"options": "Account"
},
{
"fieldname": "round_off_for_opening",
"fieldtype": "Link",
"label": "Round Off for Opening",
"options": "Account"
}
],
"icon": "fa fa-building",
@@ -792,7 +799,7 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
"modified": "2024-07-24 18:17:56.413971",
"modified": "2024-08-02 11:34:46.785377",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",

View File

@@ -91,6 +91,7 @@ class Company(NestedSet):
rgt: DF.Int
round_off_account: DF.Link | None
round_off_cost_center: DF.Link | None
round_off_for_opening: DF.Link | None
sales_monthly_history: DF.SmallText | None
series_for_depreciation_entry: DF.Data | None
stock_adjustment_account: DF.Link | None