nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 06:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: submit and make JV through background job

Browse Source 
(cherry picked from commit 4f51c5a433)

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

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

@@ -93,6 +93,7 @@
"exchange_rate_revaluation_settings_section",
"auto_exchange_rate_revaluation",
"auto_err_frequency",
"submit_err_jv",
"budget_detail",
"exception_budget_approver_role",
"registration_info",
@@ -748,7 +749,16 @@
"fieldtype": "Select",
"label": "Frequency",
"options": "Daily\nWeekly"
<<<<<<< HEAD
>>>>>>> 6644311c8b (refactor: checkbox for enabling auto ERR creation)
=======
},
{
"default": "0",
"fieldname": "submit_err_jv",
"fieldtype": "Check",
"label": "Submit ERR Journals?"
>>>>>>> 4f51c5a433 (refactor: submit and make JV through background job)
}
],
"icon": "fa fa-building",
@@ -756,11 +766,15 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
<<<<<<< HEAD
<<<<<<< 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": "2023-07-07 05:41:41.537256",
>>>>>>> 4f51c5a433 (refactor: submit and make JV through background job)
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",