mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-07 15:12:51 +00:00
[minor] fixed conflict while merging perpetual branch into master
This commit is contained in:
@@ -6,7 +6,6 @@ import webnotes
|
||||
def execute():
|
||||
from_global_defaults = {
|
||||
"credit_controller": "Accounts Settings",
|
||||
"auto_inventory_accounting": "Accounts Settings",
|
||||
"acc_frozen_upto": "Accounts Settings",
|
||||
"bde_auth_role": "Accounts Settings",
|
||||
"auto_indent": "Stock Settings",
|
||||
|
||||
Reference in New Issue
Block a user