From 72b1128467461a53746d1968dffbde303a259cfc Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 28 Sep 2015 17:27:02 +0530 Subject: [PATCH] [fixes] accounts controller add flt --- erpnext/controllers/accounts_controller.py | 2 +- erpnext/setup/doctype/email_digest/email_digest.py | 3 +-- erpnext/setup/doctype/naming_series/naming_series.py | 9 +++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 45b94d7399..2620385708 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -169,7 +169,7 @@ class AccountsController(TransactionBase): if item.price_list_rate: item.rate = flt(item.price_list_rate * - (1.0 - (item.discount_percentage / 100.0)), item.precision("rate")) + (1.0 - (flt(item.discount_percentage) / 100.0)), item.precision("rate")) def set_taxes(self): if not self.meta.get_field("taxes"): diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index 87a10430ac..599e9c55de 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -84,8 +84,7 @@ class EmailDigest(Document): common_msg) if msg_for_this_receipient: frappe.sendmail(recipients=user_id, - subject="[ERPNext] [{frequency} Digest] {name}".format( - frequency=self.frequency, name=self.name), + subject="{frequency} Digest".format(frequency=self.frequency), message=msg_for_this_receipient, bulk=True) def get_digest_msg(self): diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index 81a4c4ec5f..a1f48792e0 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -69,12 +69,13 @@ class NamingSeries(Document): # update in property setter prop_dict = {'options': "\n".join(options), 'default': default} + for prop in prop_dict: - ps_exists = frappe.db.sql("""SELECT name FROM `tabProperty Setter` - WHERE doc_type = %s AND field_name = 'naming_series' - AND property = %s""", (doctype, prop)) + ps_exists = frappe.db.get_value("Property Setter", + {"field_name": 'naming_series', 'doc_type': doctype, 'property': prop}) + if ps_exists: - ps = frappe.get_doc('Property Setter', ps_exists[0][0]) + ps = frappe.get_doc('Property Setter', ps_exists) ps.value = prop_dict[prop] ps.save() else: