Merge branch 'latest' of github.com:webnotes/erpnext into latest
diff --git a/erpnext/patches/jan_mar_2012/website/website.py b/erpnext/patches/jan_mar_2012/website/website.py
index 3494b70..320c31e 100644
--- a/erpnext/patches/jan_mar_2012/website/website.py
+++ b/erpnext/patches/jan_mar_2012/website/website.py
@@ -44,6 +44,7 @@
reload_doc('website', 'page', 'unsubscribe')
create_home_page()
+ add_website_manager()
def create_home_page():
"""create a dummy home page"""
diff --git a/erpnext/setup/doctype/email_settings/email_settings.py b/erpnext/setup/doctype/email_settings/email_settings.py
index c5e6a8e..8cb5a56 100644
--- a/erpnext/setup/doctype/email_settings/email_settings.py
+++ b/erpnext/setup/doctype/email_settings/email_settings.py
@@ -38,6 +38,7 @@
from webnotes.utils import cint
import _socket
from webnotes.utils.email_lib.send import EMail
+ import smtplib
out_email = EMail()
out_email.server = self.doc.outgoing_mail_server.encode('utf-8')
out_email.port = cint(self.doc.mail_port)
diff --git a/erpnext/startup/feature_setup.js b/erpnext/startup/feature_setup.js
index ba81cbd..a7b6dd1 100644
--- a/erpnext/startup/feature_setup.js
+++ b/erpnext/startup/feature_setup.js
@@ -24,8 +24,8 @@
'Timesheet': {'timesheet_details':['project_name']}
},
'fs_packing_details': {
- 'Delivery Note': {'fields':['packing_details','print_packing_slip','packing_checked_by','packed_by','pack_size','shipping_mark'],'delivery_note_details':['no_of_packs','pack_gross_wt','pack_nett_wt','pack_no','pack_unit']},
- 'Sales Order': {'fields':['packing_details']}
+ //'Delivery Note': {'fields':['packing_details','print_packing_slip','packing_checked_by','packed_by','pack_size','shipping_mark'],'delivery_note_details':['no_of_packs','pack_gross_wt','pack_nett_wt','pack_no','pack_unit']},
+ //'Sales Order': {'fields':['packing_details']}
},
'fs_discounts': {
'Delivery Note': {'delivery_note_details':['adj_rate']},
diff --git a/js/all-app.js b/js/all-app.js
index 6b91ce2..826b6e0 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/version.num b/version.num
index b14de3a..8d73f93 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-421
\ No newline at end of file
+422