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

[fix] event creation on Contact Date

Browse Source
This commit is contained in:
Anand Doshi 2015-08-26 17:56:40 +05:30
parent e91b3ea407
commit 414248b792
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/utilities/transaction_base.py
View File

@ -34,7 +34,7 @@ class TransactionBase(StatusUpdater):
if events: if events:
frappe.db.sql("delete from `tabEvent` where name in (%s)" frappe.db.sql("delete from `tabEvent` where name in (%s)"
.format(", ".join(['%s']*len(events))), tuple(events)) .format(", ".join(['%s']*len(events))), tuple(events))
frappe.db.sql("delete from `tabEvent Role` where parent in (%s)" frappe.db.sql("delete from `tabEvent Role` where parent in (%s)"
.format(", ".join(['%s']*len(events))), tuple(events)) .format(", ".join(['%s']*len(events))), tuple(events))
@ -47,7 +47,7 @@ class TransactionBase(StatusUpdater):
"owner": opts.owner or self.owner, "owner": opts.owner or self.owner,
"subject": opts.subject, "subject": opts.subject,
"description": opts.description, "description": opts.description,
"starts_on": self.contact_date + " 10:00:00", "starts_on": self.contact_date,
"event_type": "Private", "event_type": "Private",
"ref_type": self.doctype, "ref_type": self.doctype,
"ref_name": self.name "ref_name": self.name
@ -56,7 +56,7 @@ class TransactionBase(StatusUpdater):
event.insert(ignore_permissions=True) event.insert(ignore_permissions=True)
if frappe.db.exists("User", self.contact_by): 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}) flags={"ignore_share_permission": True})
def validate_uom_is_integer(self, uom_field, qty_fields): def validate_uom_is_integer(self, uom_field, qty_fields):
@ -92,14 +92,14 @@ class TransactionBase(StatusUpdater):
for field, condition in fields: for field, condition in fields:
if prevdoc_values[field] is not None: if prevdoc_values[field] is not None:
self.validate_value(field, condition, prevdoc_values[field], doc) self.validate_value(field, condition, prevdoc_values[field], doc)
def validate_rate_with_reference_doc(self, ref_details): def validate_rate_with_reference_doc(self, ref_details):
for ref_dt, ref_dn_field, ref_link_field in ref_details: for ref_dt, ref_dn_field, ref_link_field in ref_details:
for d in self.get("items"): for d in self.get("items"):
if d.get(ref_link_field): if d.get(ref_link_field):
ref_rate = frappe.db.get_value(ref_dt + " Item", d.get(ref_link_field), "rate") 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: if abs(flt(d.rate - ref_rate, d.precision("rate"))) >= .01:
frappe.throw(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ") 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)) .format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate))