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

fix patches

Browse Source
This commit is contained in:
Pratik Vyas 2014-05-10 22:17:04 +05:30
parent 95f558e7bc
commit 6e686224eb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/4_0/customer_discount_to_pricing_rule.py
View File

@ -23,10 +23,10 @@ def execute():
"item_group": item_group,
"applicable_for": "Customer",
"customer": d.parent,
"price_or_discount": "Discount",
"price_or_discount": "Discount Percentage",
"discount_percentage": d.discount
}).insert()
frappe.db.auto_commit_on_many_writes = False
frappe.delete_doc("DocType", "Customer Discount")
frappe.delete_doc("DocType", "Customer Discount")

2
erpnext/support/doctype/support_email_settings/support_email_settings.py
View File

@ -17,7 +17,7 @@ class SupportEmailSettings(Document):
Checks support ticket email settings
"""
if self.sync_support_mails and self.mail_server:
inc_email = frappe.get_doc('Incoming Email Settings')
inc_email = frappe._dict(self.as_dict())
# inc_email.encode()
inc_email.host = self.mail_server
inc_email.use_ssl = self.use_ssl