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

[fix] tests

Browse Source
This commit is contained in:
Rushabh Mehta 2016-03-31 16:55:21 +05:30
parent 45c6b550f0
commit b04409746e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/shopping_cart/test_shopping_cart.py
View File

@ -197,8 +197,7 @@ class TestShoppingCart(unittest.TestCase):
def remove_all_items_from_cart(self): def remove_all_items_from_cart(self):
quotation = _get_cart_quotation() quotation = _get_cart_quotation()
quotation.set("items", []) quotation.delete()
quotation.save(ignore_permissions=True)
def create_user_if_not_exists(self, email, first_name = None): def create_user_if_not_exists(self, email, first_name = None):
if frappe.db.exists("User", email): if frappe.db.exists("User", email):

6
erpnext/utilities/doctype/contact/contact.py
View File

@ -98,7 +98,7 @@ def update_contact(doc, method):
contact_name = frappe.db.get_value("Contact", {"email_id": doc.name}) contact_name = frappe.db.get_value("Contact", {"email_id": doc.name})
if contact_name: if contact_name:
contact = frappe.get_doc("Contact", contact_name) contact = frappe.get_doc("Contact", contact_name)
contact.first_name = doc.first_name for key in ("first_name", "last_name", "phone"):
contact.last_name = doc.last_name if doc.get(key):
contact.phone = doc.phone contact.set(key, doc.get(key))
contact.save(ignore_permissions=True) contact.save(ignore_permissions=True)