Merge branch 'master' of github.com:webnotes/erpnext into responsive

Conflicts:
	projects/doctype/project/project.py
	utilities/transaction_base.py
This commit is contained in:
Anand Doshi
2013-06-17 12:55:05 +05:30
4 changed files with 12 additions and 17 deletions

View File

@@ -357,3 +357,6 @@ def validate_currency(args, item, meta=None):
get_field_precision(meta.get_field("plc_conversion_rate"),
webnotes._dict({"fields": args})))
def delete_events(ref_type, ref_name):
webnotes.delete_doc("Event", webnotes.conn.sql_list("""select name from `tabEvent`
where ref_type=%s and ref_name=%s""", (ref_type, ref_name)), for_reload=True)