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

fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891

Browse Source
This commit is contained in:
Rushabh Mehta 2019-02-09 21:10:29 +05:30
parent 665ee4ac33
commit c8018bdeb1
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/selling/doctype/customer/test_customer.py
View File

@ -117,8 +117,8 @@ class TestCustomer(unittest.TestCase):
def test_rename(self): def test_rename(self):
# delete communication linked to these 2 customers # delete communication linked to these 2 customers
for name in ("_Test Customer 1", "_Test Customer 1 Renamed"): for name in ("_Test Customer 1", "_Test Customer 1 Renamed"):
frappe.db.sql("""delete from `tabCommunication` frappe.db.sql("""delete from `tabComment`
where communication_type='Comment' and reference_doctype=%s and reference_name=%s""", where reference_doctype=%s and reference_name=%s""",
("Customer", name)) ("Customer", name))
# add comments # add comments
@ -132,8 +132,7 @@ class TestCustomer(unittest.TestCase):
self.assertFalse(frappe.db.exists("Customer", "_Test Customer 1")) self.assertFalse(frappe.db.exists("Customer", "_Test Customer 1"))
# test that comment gets linked to renamed doc # test that comment gets linked to renamed doc
self.assertEqual(frappe.db.get_value("Communication", { self.assertEqual(frappe.db.get_value("Comment", {
"communication_type": "Comment",
"reference_doctype": "Customer", "reference_doctype": "Customer",
"reference_name": "_Test Customer 1 Renamed" "reference_name": "_Test Customer 1 Renamed"
}), comment.name) }), comment.name)

5
erpnext/setup/setup_wizard/operations/defaults_setup.py
View File

@ -5,7 +5,6 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import cstr, getdate from frappe.utils import cstr, getdate
from frappe.core.doctype.communication.comment import add_info_comment
def set_default_settings(args): def set_default_settings(args):
# enable default currency # enable default currency
@ -114,9 +113,7 @@ def create_territories():
def create_feed_and_todo(): def create_feed_and_todo():
"""update Activity feed and create todo for creation of item, customer, vendor""" """update Activity feed and create todo for creation of item, customer, vendor"""
add_info_comment(**{ return
"subject": _("ERPNext Setup Complete!")
})
def get_fy_details(fy_start_date, fy_end_date): def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year start_year = getdate(fy_start_date).year