Merge branch 'latest' of github.com:webnotes/erpnext into latest

erpnext/patches/jan_mar_2012/website/website.py

@@ -44,6 +44,7 @@ def execute():
 	reload_doc('website', 'page', 'unsubscribe')
 		
 	create_home_page()
+	add_website_manager()
 
 def create_home_page():
 	"""create a dummy home page"""

erpnext/setup/doctype/email_settings/email_settings.py

@@ -38,6 +38,7 @@ class DocType:
 			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)

erpnext/startup/feature_setup.js

@@ -24,8 +24,8 @@ pscript.feature_dict = {
 		'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']},

version.num

@@ -1 +1 @@
-421
+422