mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-19 01:25:07 +00:00
* fix: use max function to get default company address (cherry picked from commitb93c18bd4a) * test: add test for primary address sorting (cherry picked from commite0042972c8) --------- Co-authored-by: Prateek <40106895+prateekkaramchandani@users.noreply.github.com> Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
@@ -808,7 +808,7 @@ def get_default_company_address(name, sort_key="is_primary_address", existing_ad
|
|||||||
return existing_address
|
return existing_address
|
||||||
|
|
||||||
if out:
|
if out:
|
||||||
return min(out, key=lambda x: x[1])[0] # find min by sort_key
|
return max(out, key=lambda x: x[1])[0] # find max by sort_key
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ from frappe.utils import random_string
|
|||||||
from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import (
|
from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import (
|
||||||
get_charts_for_country,
|
get_charts_for_country,
|
||||||
)
|
)
|
||||||
|
from erpnext.setup.doctype.company.company import get_default_company_address
|
||||||
|
|
||||||
test_ignore = ["Account", "Cost Center", "Payment Terms Template", "Salary Component", "Warehouse"]
|
test_ignore = ["Account", "Cost Center", "Payment Terms Template", "Salary Component", "Warehouse"]
|
||||||
test_dependencies = ["Fiscal Year"]
|
test_dependencies = ["Fiscal Year"]
|
||||||
@@ -132,6 +133,38 @@ class TestCompany(unittest.TestCase):
|
|||||||
self.assertTrue(lft >= min_lft)
|
self.assertTrue(lft >= min_lft)
|
||||||
self.assertTrue(rgt <= max_rgt)
|
self.assertTrue(rgt <= max_rgt)
|
||||||
|
|
||||||
|
def test_primary_address(self):
|
||||||
|
company = "_Test Company"
|
||||||
|
|
||||||
|
secondary = frappe.get_doc(
|
||||||
|
{
|
||||||
|
"address_title": "Non Primary",
|
||||||
|
"doctype": "Address",
|
||||||
|
"address_type": "Billing",
|
||||||
|
"address_line1": "Something",
|
||||||
|
"city": "Mumbai",
|
||||||
|
"state": "Maharashtra",
|
||||||
|
"country": "India",
|
||||||
|
"is_primary_address": 1,
|
||||||
|
"pincode": "400098",
|
||||||
|
"links": [
|
||||||
|
{
|
||||||
|
"link_doctype": "Company",
|
||||||
|
"link_name": company,
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
secondary.insert()
|
||||||
|
self.addCleanup(secondary.delete)
|
||||||
|
|
||||||
|
primary = frappe.copy_doc(secondary)
|
||||||
|
primary.is_primary_address = 1
|
||||||
|
primary.insert()
|
||||||
|
self.addCleanup(primary.delete)
|
||||||
|
|
||||||
|
self.assertEqual(get_default_company_address(company), primary.name)
|
||||||
|
|
||||||
def get_no_of_children(self, company):
|
def get_no_of_children(self, company):
|
||||||
def get_no_of_children(companies, no_of_children):
|
def get_no_of_children(companies, no_of_children):
|
||||||
children = []
|
children = []
|
||||||
|
|||||||
Reference in New Issue
Block a user