Skip to content

refactor: company details popup #50749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 30, 2025
Merged

refactor: company details popup #50749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a4c1a9
refactor: Replace use publish_realtime with msgprint for cleaner flow
khushi8112 Nov 26, 2025
b808a51
refactor: Make labels translatable
khushi8112 Nov 30, 2025
5cfd7ec
refactor: generalize popup for multiple doctypes
khushi8112 Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,59 +282,6 @@ def set_indicator(self):
self.indicator_color = "green"
self.indicator_title = _("Paid")

def before_print(self, settings=None):
from frappe.contacts.doctype.address.address import get_address_display_list

super().before_print(settings)

company_details = frappe.get_value(
"Company", self.company, ["company_logo", "website", "phone_no", "email"], as_dict=True
)

required_fields = [
company_details.get("company_logo"),
company_details.get("phone_no"),
company_details.get("email"),
]

if not all(required_fields) and not frappe.has_permission("Company", "write", throw=False):
frappe.msgprint(
_(
"Some required Company details are missing. You don't have permission to update them. Please contact your System Manager."
)
)
return

if not self.company_address and not frappe.has_permission("Sales Invoice", "write", throw=False):
frappe.msgprint(
_(
"Company Address is missing. You don't have permission to update it. Please contact your System Manager."
)
)
return

address_display_list = get_address_display_list("Company", self.company)
address_line = address_display_list[0].get("address_line1") if address_display_list else ""

required_fields.append(self.company_address)
required_fields.append(address_line)

if not all(required_fields):
frappe.publish_realtime(
"sales_invoice_before_print",
{
"company_logo": company_details.get("company_logo"),
"website": company_details.get("website"),
"phone_no": company_details.get("phone_no"),
"email": company_details.get("email"),
"address_line": address_line,
"company": self.company,
"company_address": self.company_address,
"name": self.name,
},
user=frappe.session.user,
)

def validate(self):
self.validate_auto_set_posting_time()
super().validate()
Expand Down Expand Up @@ -2948,59 +2895,6 @@ def get_loyalty_programs(customer):
return lp_details


@frappe.whitelist()
def save_company_master_details(name, company, details):
from frappe.utils import validate_email_address

if isinstance(details, str):
details = frappe.parse_json(details)

if details.get("email"):
validate_email_address(details.get("email"), throw=True)

company_fields = ["company_logo", "website", "phone_no", "email"]
company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)}

if company_fields_to_update:
frappe.db.set_value("Company", company, company_fields_to_update)

company_address = details.get("company_address")
if details.get("address_line1"):
address_doc = frappe.get_doc(
{
"doctype": "Address",
"address_title": details.get("address_title"),
"address_type": details.get("address_type"),
"address_line1": details.get("address_line1"),
"address_line2": details.get("address_line2"),
"city": details.get("city"),
"state": details.get("state"),
"pincode": details.get("pincode"),
"country": details.get("country"),
"is_your_company_address": 1,
"links": [{"link_doctype": "Company", "link_name": company}],
}
)
address_doc.insert()
company_address = address_doc.name

if company_address:
company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display")
if not company_address_display or details.get("address_line1"):
from frappe.query_builder import DocType

SalesInvoice = DocType("Sales Invoice")

(
frappe.qb.update(SalesInvoice)
.set(SalesInvoice.company_address, company_address)
.set(SalesInvoice.company_address_display, get_address_display(company_address))
.where(SalesInvoice.name == name)
).run()

return True


@frappe.whitelist()
def create_invoice_discounting(source_name, target_doc=None):
invoice = frappe.get_doc("Sales Invoice", source_name)
Expand Down
128 changes: 128 additions & 0 deletions erpnext/controllers/accounts_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import frappe
from frappe import _, bold, qb, throw
from frappe.contacts.doctype.address.address import get_address_display
from frappe.model.workflow import get_workflow_name, is_transition_condition_satisfied
from frappe.query_builder import Criterion, DocType
from frappe.query_builder.custom import ConstantColumn
Expand Down Expand Up @@ -4167,3 +4168,130 @@ def update_gl_dict_with_regional_fields(doc, gl_dict):
def update_gl_dict_with_app_based_fields(doc, gl_dict):
for method in frappe.get_hooks("update_gl_dict_with_app_based_fields", default=[]):
frappe.get_attr(method)(doc, gl_dict)


@frappe.whitelist()
def get_missing_company_details(doctype, docname):
from frappe.contacts.doctype.address.address import get_address_display_list

company = frappe.db.get_value(doctype, docname, "company")
if doctype == "Purchase Order":
company_address = frappe.db.get_value(doctype, docname, "billing_address")
else:
company_address = frappe.db.get_value(doctype, docname, "company_address")

company_details = frappe.get_value(
"Company", company, ["company_logo", "website", "phone_no", "email"], as_dict=True
)

required_fields = [
company_details.get("company_logo"),
company_details.get("phone_no"),
company_details.get("email"),
]

if not all(required_fields) and not frappe.has_permission("Company", "write", throw=False):
frappe.msgprint(
_(
"Some required Company details are missing. You don't have permission to update them. Please contact your System Manager."
)
)
return

if not company_address and not frappe.has_permission(doctype, "write", throw=False):
frappe.msgprint(
_(
"Company Address is missing. You don't have permission to update it. Please contact your System Manager."
)
)
return

address_display_list = get_address_display_list("Company", company)
address_line = address_display_list[0].get("address_line1") if address_display_list else ""

required_fields.append(company_address)
required_fields.append(address_line)

if all(required_fields):
return False
return {
"company_logo": company_details.get("company_logo"),
"website": company_details.get("website"),
"phone_no": company_details.get("phone_no"),
"email": company_details.get("email"),
"address_line": address_line,
"company": company,
"company_address": company_address,
"name": docname,
}


@frappe.whitelist()
def update_company_master_and_address(current_doctype, name, company, details):
from frappe.utils import validate_email_address

if isinstance(details, str):
details = frappe.parse_json(details)

if details.get("email"):
validate_email_address(details.get("email"), throw=True)

company_fields = ["company_logo", "website", "phone_no", "email"]
company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)}

if company_fields_to_update:
frappe.db.set_value("Company", company, company_fields_to_update)

company_address = details.get("company_address")
if details.get("address_line1"):
address_doc = frappe.get_doc(
{
"doctype": "Address",
"address_title": details.get("address_title"),
"address_type": details.get("address_type"),
"address_line1": details.get("address_line1"),
"address_line2": details.get("address_line2"),
"city": details.get("city"),
"state": details.get("state"),
"pincode": details.get("pincode"),
"country": details.get("country"),
"is_your_company_address": 1,
"links": [{"link_doctype": "Company", "link_name": company}],
}
)
address_doc.insert()
company_address = address_doc.name

update_doc_company_address(current_doctype, name, company_address, details)


def update_doc_company_address(current_doctype, docname, company_address, details):
if not company_address:
return

address_field_map = {
"Purchase Order": ("billing_address", "billing_address_display"),
"Sales Invoice": ("company_address", "company_address_display"),
"Delivery Note": ("company_address", "company_address_display"),
"POS Invoice": ("company_address", "company_address_display"),
}

address_field, display_field = address_field_map.get(
current_doctype, ("company_address", "company_address_display")
)

current_display = frappe.db.get_value(current_doctype, docname, display_field)

if current_display and not details.get("address_line1"):
return

from frappe.query_builder import DocType

DocType = DocType(current_doctype)

(
frappe.qb.update(DocType)
.set(getattr(DocType, address_field), company_address)
.set(getattr(DocType, display_field), get_address_display(company_address))
.where(DocType.name == docname)
).run()
Loading