From 7dad1a35e9079d93b5fff9fd06bf0b2d302e055f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 18 Dec 2017 11:50:46 +0530 Subject: [PATCH 1/4] Update add_sms_sender_name_as_parameters.py --- frappe/patches/v9_1/add_sms_sender_name_as_parameters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/patches/v9_1/add_sms_sender_name_as_parameters.py b/frappe/patches/v9_1/add_sms_sender_name_as_parameters.py index 5ace17872b..9d7c0f003f 100644 --- a/frappe/patches/v9_1/add_sms_sender_name_as_parameters.py +++ b/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() \ No newline at end of file + sms_settings.save() From 0a367e837e9bb4c376fa5fba9f766bb11c012a02 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 21 Dec 2017 15:16:05 +0530 Subject: [PATCH 2/4] [Fix] Decimal issue --- frappe/utils/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 6bf0cb8880..d497c58f2b 100644 --- a/frappe/utils/data.py +++ b/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) From 9bb4239dd5932b6534d0e009360f8cf348a5678d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 25 Dec 2017 11:27:56 +0530 Subject: [PATCH 3/4] [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#4672) --- frappe/contacts/doctype/address/address.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py index 9cb099e5cb..2ec2f6504b 100644 --- a/frappe/contacts/doctype/address/address.py +++ b/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: From 4ebe337e0776a0e2e3eb1b4051619e1d7ae1920f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 25 Dec 2017 14:00:48 +0600 Subject: [PATCH 4/4] bumped to version 9.2.25 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8fb2a1bb3a..49367fe855 100644 --- a/frappe/__init__.py +++ b/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()