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

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra
2025-11-15 19:39:40 +01:00
parent 088bbac543
commit e29a384f90
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/setup/install.py
View File

@@ -6,7 +6,6 @@ import click
import frappe import frappe
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
from frappe.utils import cint
import erpnext import erpnext
from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
@@ -193,10 +192,6 @@ def add_company_to_session_defaults():
def add_standard_navbar_items(): def add_standard_navbar_items():
navbar_settings = frappe.get_single("Navbar Settings") navbar_settings = frappe.get_single("Navbar Settings")
<<<<<<< HEAD
=======
>>>>>>> 9a989a84fb (fix: use dummy translations for custom field labels (#49875))
erpnext_navbar_items = [ erpnext_navbar_items = [
{ {
"item_label": _("Documentation"), "item_label": _("Documentation"),

4
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -7,7 +7,6 @@ import os
from pathlib import Path from pathlib import Path
import frappe import frappe
from frappe import _
from frappe.desk.doctype.global_search_settings.global_search_settings import ( from frappe.desk.doctype.global_search_settings.global_search_settings import (
update_global_search_doctypes, update_global_search_doctypes,
) )
@@ -16,10 +15,7 @@ from frappe.utils import cstr, getdate
from erpnext.accounts.doctype.account.account import RootNotEditable from erpnext.accounts.doctype.account.account import RootNotEditable
from erpnext.regional.address_template.setup import set_up_address_templates from erpnext.regional.address_template.setup import set_up_address_templates
<<<<<<< HEAD
=======
from erpnext.setup.utils import identity as _ from erpnext.setup.utils import identity as _
>>>>>>> 9a989a84fb (fix: use dummy translations for custom field labels (#49875))
def read_lines(filename: str) -> list[str]: def read_lines(filename: str) -> list[str]: