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

[merge] fix

Browse Source
This commit is contained in:
Rushabh Mehta 2014-12-03 12:34:11 +05:30
parent eca7e22cda
commit 9f32a50379
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches/v4_4/make_email_accounts.py
View File

@ -51,7 +51,6 @@ def execute():
# sales, jobs # sales, jobs
for doctype in ("Sales Email Settings", "Jobs Email Settings"): for doctype in ("Sales Email Settings", "Jobs Email Settings"):
source = dict(frappe.db.sql("select field, value from tabSingles where doctype=%s", doctype)) source = dict(frappe.db.sql("select field, value from tabSingles where doctype=%s", doctype))
print source
if source and source.get('host'): if source and source.get('host'):
account = frappe.new_doc("Email Account") account = frappe.new_doc("Email Account")
mapping = { mapping = {

17
erpnext/utilities/doctype/contact/contact.js
View File

@ -3,9 +3,7 @@
{% include 'controllers/js/contact_address_common.js' %}; {% include 'controllers/js/contact_address_common.js' %};
<<<<<<< HEAD
cur_frm.email_field = "email_id"; cur_frm.email_field = "email_id";
=======
frappe.ui.form.on("Contact", "validate", function(frm) { frappe.ui.form.on("Contact", "validate", function(frm) {
// clear linked customer / supplier / sales partner on saving... // clear linked customer / supplier / sales partner on saving...
$.each(["Customer", "Supplier", "Sales Partner"], function(i, doctype) { $.each(["Customer", "Supplier", "Sales Partner"], function(i, doctype) {
@ -14,18 +12,3 @@ frappe.ui.form.on("Contact", "validate", function(frm) {
frappe.model.remove_from_locals(doctype, name); frappe.model.remove_from_locals(doctype, name);
}); });
}); });
cur_frm.cscript.refresh = function(doc) {
cur_frm.communication_view = new frappe.views.CommunicationList({
list: frappe.get_list("Communication", {"parent": doc.name, "parenttype": "Contact"}),
parent: cur_frm.fields_dict.communication_html.wrapper,
doc: doc,
recipients: doc.email_id
});
}
>>>>>>> upstream/develop
cur_frm.cscript.hide_dialog = function() {
if(cur_frm.contact_list)
cur_frm.contact_list.run();
}

4
setup.py
View File

@ -1,10 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
<<<<<<< HEAD
version = "5.0.0-alpha" version = "5.0.0-alpha"
=======
version = "4.12.0"
>>>>>>> upstream/develop
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()