CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: checkbox for enabling auto ERR creation

Browse Source 
(cherry picked from commit 6644311c8b)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
This commit is contained in:
ruthra kumar
2023-07-03 14:30:15 +05:30
committed by Mergify
parent e443e6c02a
commit e0fbf0c042
1 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,9 @@
"depreciation_cost_center",
"capital_work_in_progress_account",
"asset_received_but_not_billed",
"exchange_rate_revaluation_settings_section",
"auto_exchange_rate_revaluation",
"auto_err_frequency",
"budget_detail",
"exception_budget_approver_role",
"registration_info",
@@ -694,6 +697,58 @@
"label": "Default Provisional Account",
"no_copy": 1,
"options": "Account"
<<<<<<< HEAD
=======
},
{
"fieldname": "advance_payments_section",
"fieldtype": "Section Break",
"label": "Advance Payments"
},
{
"depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
"fieldname": "default_advance_received_account",
"fieldtype": "Link",
"label": "Default Advance Received Account",
"mandatory_depends_on": "book_advance_payments_as_liability",
"options": "Account"
},
{
"depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
"fieldname": "default_advance_paid_account",
"fieldtype": "Link",
"label": "Default Advance Paid Account",
"mandatory_depends_on": "book_advance_payments_as_liability",
"options": "Account"
},
{
"fieldname": "column_break_fwcf",
"fieldtype": "Column Break"
},
{
"default": "0",
"description": "Enabling this option will allow you to record - <br><br> 1. Advances Received in a <b>Liability Account</b> instead of the <b>Asset Account</b><br><br>2. Advances Paid in an <b>Asset Account</b> instead of the <b> Liability Account</b>",
"fieldname": "book_advance_payments_in_separate_party_account",
"fieldtype": "Check",
"label": "Book Advance Payments in Separate Party Account"
},
{
"fieldname": "exchange_rate_revaluation_settings_section",
"fieldtype": "Section Break",
"label": "Exchange Rate Revaluation Settings"
},
{
"default": "0",
"fieldname": "auto_exchange_rate_revaluation",
"fieldtype": "Check",
"label": "Auto Create Exchange Rate Revaluation"
},
{
"fieldname": "auto_err_frequency",
"fieldtype": "Select",
"label": "Frequency",
"options": "Daily\nWeekly"
>>>>>>> 6644311c8b (refactor: checkbox for enabling auto ERR creation)
}
],
"icon": "fa fa-building",
@@ -701,7 +756,11 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-08-16 16:09:02.327724",
=======
"modified": "2023-07-03 14:29:56.262188",
>>>>>>> 6644311c8b (refactor: checkbox for enabling auto ERR creation)
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",