Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes] accounts controller add flt

Browse Source
This commit is contained in:
Rushabh Mehta 2015-09-28 17:27:02 +05:30
parent 33b10faf94
commit 72b1128467
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/accounts_controller.py
View File

@ -169,7 +169,7 @@ class AccountsController(TransactionBase):
if item.price_list_rate: if item.price_list_rate:
item.rate = flt(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): def set_taxes(self):
if not self.meta.get_field("taxes"): if not self.meta.get_field("taxes"):

3
erpnext/setup/doctype/email_digest/email_digest.py
View File

@ -84,8 +84,7 @@ class EmailDigest(Document):
common_msg) common_msg)
if msg_for_this_receipient: if msg_for_this_receipient:
frappe.sendmail(recipients=user_id, frappe.sendmail(recipients=user_id,
subject="[ERPNext] [{frequency} Digest] {name}".format( subject="{frequency} Digest".format(frequency=self.frequency),
frequency=self.frequency, name=self.name),
message=msg_for_this_receipient, bulk=True) message=msg_for_this_receipient, bulk=True)
def get_digest_msg(self): def get_digest_msg(self):

9
erpnext/setup/doctype/naming_series/naming_series.py
View File

@ -69,12 +69,13 @@ class NamingSeries(Document):
# update in property setter # update in property setter
prop_dict = {'options': "\n".join(options), 'default': default} prop_dict = {'options': "\n".join(options), 'default': default}
for prop in prop_dict: for prop in prop_dict:
ps_exists = frappe.db.sql("""SELECT name FROM `tabProperty Setter` ps_exists = frappe.db.get_value("Property Setter",
WHERE doc_type = %s AND field_name = 'naming_series' {"field_name": 'naming_series', 'doc_type': doctype, 'property': prop})
AND property = %s""", (doctype, prop))
if ps_exists: 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.value = prop_dict[prop]
ps.save() ps.save()
else: else: