[fixes] accounts controller add flt
This commit is contained in:
parent
33b10faf94
commit
72b1128467
@ -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"):
|
||||
|
@ -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):
|
||||
|
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user