nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 22:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype

Browse Source
This commit is contained in:
Suraj Shetty
2023-08-30 16:46:00 +05:30
committed by GitHub
parent de433d8626 5e38109481
commit e92d4e9b4a
76 changed files with 3586 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,14 +403,20 @@ class Company(NestedSet):
self._set_default_account(default_account, default_accounts.get(default_account))
if not self.default_income_account:
income_account = frappe.db.get_value(
"Account", {"account_name": _("Sales"), "company": self.name, "is_group": 0}
income_account = frappe.db.get_all(
"Account",
filters={"company": self.name, "is_group": 0},
or_filters={
"account_name": ("in", [_("Sales"), _("Sales Account")]),
"account_type": "Income Account",
},
pluck="name",
)
if not income_account:
income_account = frappe.db.get_value(
"Account", {"account_name": _("Sales Account"), "company": self.name}
)
if income_account:
income_account = income_account[0]
else:
income_account = None
self.db_set("default_income_account", income_account)

5
erpnext/setup/doctype/item_group/item_group.json
View File

@@ -233,7 +233,7 @@
"is_tree": 1,
"links": [],
"max_attachments": 3,
"modified": "2023-01-05 12:21:30.458628",
"modified": "2023-08-28 22:27:48.382985",
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",
@@ -266,7 +266,6 @@
"read": 1,
"report": 1,
"role": "Item Manager",
"set_user_permissions": 1,
"share": 1,
"write": 1
},
@@ -296,7 +295,7 @@
"export": 1,
"print": 1,
"report": 1,
"role": "All",
"role": "Desk User",
"select": 1,
"share": 1
}

175
erpnext/setup/doctype/print_heading/print_heading.json
View File

@@ -1,131 +1,68 @@
{
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:print_heading",
"beta": 0,
"creation": "2013-01-10 16:34:24",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:print_heading",
"creation": "2013-01-10 16:34:24",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
"print_heading",
"description"
],
"fields": [
{
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"fieldname": "print_heading",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Print Heading",
"length": 0,
"no_copy": 0,
"oldfieldname": "print_heading",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
"allow_on_submit": 1,
"fieldname": "print_heading",
"fieldtype": "Data",
"in_filter": 1,
"in_list_view": 1,
"label": "Print Heading",
"oldfieldname": "print_heading",
"oldfieldtype": "Data",
"reqd": 1,
"unique": 1
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Description",
"length": 0,
"no_copy": 0,
"oldfieldname": "description",
"oldfieldtype": "Small Text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
"width": "300px"
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-font",
"idx": 1,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-07-25 05:24:25.628101",
"modified_by": "Administrator",
"module": "Setup",
"name": "Print Heading",
"owner": "Administrator",
],
"icon": "fa fa-font",
"idx": 1,
"links": [],
"modified": "2023-08-28 22:17:42.041255",
"modified_by": "Administrator",
"module": "Setup",
"name": "Print Heading",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"create": 1,
"delete": 1,
"email": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
},
},
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 0,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 0,
"read": 1,
"report": 0,
"role": "All",
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
"read": 1,
"role": "Desk User"
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"search_fields": "print_heading",
"track_seen": 0
],
"quick_entry": 1,
"search_fields": "print_heading",
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}