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

refactor: replace get_doc with get_value

Browse Source
This commit is contained in:
khushi8112
2025-10-10 18:12:40 +05:30
parent 12ebab1657
commit 33110951b3
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -2857,10 +2857,10 @@ def save_company_master_details(name, company, details):
validate_email_address(details.email, throw=True) validate_email_address(details.email, throw=True)
company_fields = ["company_logo", "website", "phone_no", "email"] company_fields = ["company_logo", "website", "phone_no", "email"]
updated_fields = {field: details.get(field) for field in company_fields if details.get(field)} company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)}
if updated_fields: if company_fields_to_update:
frappe.db.set_value("Company", company, updated_fields) frappe.db.set_value("Company", company, company_fields_to_update)
company_address = details.get("company_address") company_address = details.get("company_address")
if details.get("address_line1"): if details.get("address_line1"):
@@ -2883,8 +2883,8 @@ def save_company_master_details(name, company, details):
company_address = address_doc.name company_address = address_doc.name
if company_address: if company_address:
current_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display")
if not current_display or details.get("address_line1"): if not company_address_display or details.get("address_line1"):
frappe.db.set_value( frappe.db.set_value(
"Sales Invoice", "Sales Invoice",
name, name,

16
erpnext/accounts/letterhead/letterhead_plain.html
View File

@@ -69,17 +69,19 @@
{{ doc.company }} {{ doc.company }}
</div> </div>
{% if doc.company_address %} {% if doc.company_address %}
{% set company_address_display = frappe.get_doc("Address", doc.company_address) %} {% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %}
{{ company_address_display.address_line1 or "" }}<br>
{% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}<br>{% endif %} {{ company_address.get("address_line1") or "" }}<br>
{{ company_address_display.city or "" }}, {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }}, {{ company_address_display.country or "" }}<br> {% if company_address.get("address_line2") %}{{ company_address.get("address_line2") }}<br>{% endif %}
{{ company_address.get("city") or "" }}, {{ company_address.get("state") or "" }} {{ company_address.get("pincode") or "" }}, {{ company_address.get("country") or "" }}<br>
{% endif %} {% endif %}
</td> </td>
<td class="invoice-info-cell"> <td class="invoice-info-cell">
{% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %}
{% set email = frappe.db.get_value("Company", doc.company, "email") %} {% set website = company_details.website %}
{% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %} {% set email = company_details.email %}
{% set phone_no = company_details.phone_no %}
<div class="invoice-info"> <div class="invoice-info">
<span class="invoice-label">{{ _("Invoice:") }}</span> <span class="invoice-label">{{ _("Invoice:") }}</span>

21
erpnext/accounts/letterhead/letterhead_with_background_colour.html
View File

@@ -22,13 +22,13 @@
vertical-align: top; vertical-align: top;
} }
.logo { .letter-head .logo {
width: 90px; width: 90px;
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
} }
.logo img { .letter-head .logo img {
border-radius: 15px; border-radius: 15px;
} }
@@ -82,12 +82,12 @@
{% endif %} {% endif %}
<div class="company-name">{{ doc.company }}</div> <div class="company-name">{{ doc.company }}</div>
<div class="company-address"> <div class="company-address">
{% if doc.company_address %} {% set company_address_display = frappe.get_doc("Address", {% if doc.company_address %}
doc.company_address) %} {{ company_address_display.address_line1 or "" }}<br /> {% if {% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %}
company_address_display.address_line2 %}{{ company_address_display.address_line2 }}<br />{% {{ company_address.address_line1 or "" }}<br />
endif %} {{ company_address_display.city or "" }}, {{ company_address_display.state or "" {% if company_address.address_line2 %} {{ company_address.address_line2 }}<br /> {% endif %}
}} {{ company_address_display.pincode or "" }}, {{ company_address_display.country or "" {{ company_address.city or "" }}, {{ company_address.state or "" }}
}}<br /> {{ company_address.pincode or "" }}, {{ company_address.country or ""}}<br />
{% endif %} {% endif %}
</div> </div>
</td> </td>
@@ -99,9 +99,8 @@
<br /> <br />
</div> </div>
<div style="text-align: left; float: right" class="other-details"> <div style="text-align: left; float: right" class="other-details">
{% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set email = {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %}
frappe.db.get_value("Company", doc.company, "email") %} {% set phone_no = {% set website = company_details.website %} {% set email = company_details.email %} {% set phone_no = company_details.phone_no %} {% if website %}
frappe.db.get_value("Company", doc.company, "phone_no") %} {% if website %}
<div> <div>
<span class="contact-title">{{ _("Website:") }}</span <span class="contact-title">{{ _("Website:") }}</span
><span class="contact-value">{{ website }}</span> ><span class="contact-value">{{ website }}</span>