Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '9.2.24'
+__version__ = '9.2.25'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/contacts/doctype/address/address.py

@@ -192,13 +192,17 @@ def get_address_templates(address):
 		return result
 
 @frappe.whitelist()
-def get_shipping_address(company):
+def get_shipping_address(company, address = None):
 	filters = [
 		["Dynamic Link", "link_doctype", "=", "Company"],
 		["Dynamic Link", "link_name", "=", company],
 		["Address", "is_your_company_address", "=", 1]
 	]
 	fields = ["name", "address_line1", "address_line2", "city", "state", "country"]
+	if address and frappe.db.get_value('Dynamic Link',
+		{'parent': address, 'link_name': company}):
+		filters.append(["Address", "name", "=", address])
+
 	address = frappe.get_all("Address", filters=filters, fields=fields) or {}
 
 	if address:

frappe/patches/v9_1/add_sms_sender_name_as_parameters.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	frappe.reload_doc("core", "doctype", "sms_parameter")
 	sms_sender_name = frappe.db.get_single_value("SMS Settings", "sms_sender_name")
 	if sms_sender_name:
 		frappe.reload_doc("core", "doctype", "sms_settings")
@@ -15,4 +16,4 @@ def execute():
 		})
 		sms_settings.flags.ignore_mandatory = True
 		sms_settings.flags.ignore_permissions = True
-		sms_settings.save()
+		sms_settings.save()

frappe/utils/data.py

@@ -381,7 +381,7 @@ def fmt_money(amount, precision=None, currency=None):
 					fraction  = frappe.db.get_value("Currency", currency, "fraction_units") or 100
 					precision = len(cstr(fraction)) - 1
 				else:
-					precision = 2
+					precision = number_format_precision
 			elif len(decimals) < precision:
 				precision = len(decimals)