diff --git a/erpnext/__version__.py b/erpnext/__version__.py index e5e5fc1c38c..889fbef84bd 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.8.1' +__version__ = '5.8.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 9ee5bc0868b..7a6a5352834 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -27,7 +27,7 @@ blogs. """ app_icon = "icon-th" app_color = "#e74c3c" -app_version = "5.8.1" +app_version = "5.8.2" github_link = "https://github.com/frappe/erpnext" error_report_email = "support@erpnext.com" diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 6c9b9a428d2..278ec3b29ff 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -34,7 +34,7 @@ class TransactionBase(StatusUpdater): if events: frappe.db.sql("delete from `tabEvent` where name in (%s)" .format(", ".join(['%s']*len(events))), tuple(events)) - + frappe.db.sql("delete from `tabEvent Role` where parent in (%s)" .format(", ".join(['%s']*len(events))), tuple(events)) @@ -47,7 +47,7 @@ class TransactionBase(StatusUpdater): "owner": opts.owner or self.owner, "subject": opts.subject, "description": opts.description, - "starts_on": self.contact_date + " 10:00:00", + "starts_on": self.contact_date, "event_type": "Private", "ref_type": self.doctype, "ref_name": self.name @@ -56,7 +56,7 @@ class TransactionBase(StatusUpdater): event.insert(ignore_permissions=True) if frappe.db.exists("User", self.contact_by): - frappe.share.add("Event", event.name, self.contact_by, + frappe.share.add("Event", event.name, self.contact_by, flags={"ignore_share_permission": True}) def validate_uom_is_integer(self, uom_field, qty_fields): @@ -92,14 +92,14 @@ class TransactionBase(StatusUpdater): for field, condition in fields: if prevdoc_values[field] is not None: self.validate_value(field, condition, prevdoc_values[field], doc) - - + + def validate_rate_with_reference_doc(self, ref_details): for ref_dt, ref_dn_field, ref_link_field in ref_details: for d in self.get("items"): if d.get(ref_link_field): ref_rate = frappe.db.get_value(ref_dt + " Item", d.get(ref_link_field), "rate") - + if abs(flt(d.rate - ref_rate, d.precision("rate"))) >= .01: frappe.throw(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ") .format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate)) diff --git a/setup.py b/setup.py index 0389555f615..6a420c3c05c 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.8.1" +version = "5.8.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()