schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: provision for monthly re-evaluation

Browse Source 
(cherry picked from commit ce2b9e0f1a)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
#	erpnext/setup/doctype/company/company.py
This commit is contained in:
ruthra kumar
2024-07-24 18:13:30 +05:30
committed by Mergify
parent 96a6172999
commit 8e340bb7fd
2 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/setup/doctype/company/company.json
View File

@@ -698,7 +698,7 @@
"fieldname": "auto_err_frequency",
"fieldtype": "Select",
"label": "Frequency",
"options": "Daily\nWeekly"
"options": "Daily\nWeekly\nMonthly"
},
{
"default": "0",
@@ -712,7 +712,11 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-05-27 17:32:49.057386",
=======
"modified": "2024-07-24 18:17:56.413971",
>>>>>>> ce2b9e0f1a (refactor: provision for monthly re-evaluation)
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",

89
erpnext/setup/doctype/company/company.py
View File

@@ -19,6 +19,95 @@ from erpnext.setup.setup_wizard.operations.taxes_setup import setup_taxes_and_ch
class Company(NestedSet):
<<<<<<< HEAD
=======
# begin: auto-generated types
# This code is auto-generated. Do not modify anything in this block.
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from frappe.types import DF
abbr: DF.Data
accumulated_depreciation_account: DF.Link | None
allow_account_creation_against_child_company: DF.Check
asset_received_but_not_billed: DF.Link | None
auto_err_frequency: DF.Literal["Daily", "Weekly", "Monthly"]
auto_exchange_rate_revaluation: DF.Check
book_advance_payments_in_separate_party_account: DF.Check
capital_work_in_progress_account: DF.Link | None
chart_of_accounts: DF.Literal[None]
company_description: DF.TextEditor | None
company_logo: DF.AttachImage | None
company_name: DF.Data
cost_center: DF.Link | None
country: DF.Link
create_chart_of_accounts_based_on: DF.Literal["", "Standard Template", "Existing Company"]
credit_limit: DF.Currency
date_of_commencement: DF.Date | None
date_of_establishment: DF.Date | None
date_of_incorporation: DF.Date | None
default_advance_paid_account: DF.Link | None
default_advance_received_account: DF.Link | None
default_bank_account: DF.Link | None
default_buying_terms: DF.Link | None
default_cash_account: DF.Link | None
default_currency: DF.Link
default_deferred_expense_account: DF.Link | None
default_deferred_revenue_account: DF.Link | None
default_discount_account: DF.Link | None
default_expense_account: DF.Link | None
default_finance_book: DF.Link | None
default_holiday_list: DF.Link | None
default_in_transit_warehouse: DF.Link | None
default_income_account: DF.Link | None
default_inventory_account: DF.Link | None
default_letter_head: DF.Link | None
default_operating_cost_account: DF.Link | None
default_payable_account: DF.Link | None
default_provisional_account: DF.Link | None
default_receivable_account: DF.Link | None
default_selling_terms: DF.Link | None
default_warehouse_for_sales_return: DF.Link | None
depreciation_cost_center: DF.Link | None
depreciation_expense_account: DF.Link | None
disposal_account: DF.Link | None
domain: DF.Data | None
email: DF.Data | None
enable_perpetual_inventory: DF.Check
enable_provisional_accounting_for_non_stock_items: DF.Check
exception_budget_approver_role: DF.Link | None
exchange_gain_loss_account: DF.Link | None
existing_company: DF.Link | None
fax: DF.Data | None
is_group: DF.Check
lft: DF.Int
monthly_sales_target: DF.Currency
old_parent: DF.Data | None
parent_company: DF.Link | None
payment_terms: DF.Link | None
phone_no: DF.Data | None
reconcile_on_advance_payment_date: DF.Check
registration_details: DF.Code | None
rgt: DF.Int
round_off_account: DF.Link | None
round_off_cost_center: DF.Link | None
sales_monthly_history: DF.SmallText | None
series_for_depreciation_entry: DF.Data | None
stock_adjustment_account: DF.Link | None
stock_received_but_not_billed: DF.Link | None
submit_err_jv: DF.Check
tax_id: DF.Data | None
total_monthly_sales: DF.Currency
transactions_annual_history: DF.Code | None
unrealized_exchange_gain_loss_account: DF.Link | None
unrealized_profit_loss_account: DF.Link | None
website: DF.Data | None
write_off_account: DF.Link | None
# end: auto-generated types
>>>>>>> ce2b9e0f1a (refactor: provision for monthly re-evaluation)
nsm_parent_field = "parent_company"
def onload(self):