Merge branch 'master' of github.com:webnotes/erpnext

accounts/doctype/gl_control/gl_control.py

@@ -51,7 +51,7 @@ class DocType:
 		ac.doc.doctype = "Account"
 		ac.doc.old_parent = ""
 		ac.doc.freeze_account = "No"
-		ac.ignore_permission = 1
+		ac.ignore_permissions = 1
 		ac.insert()
 
 		return ac.doc.name
@@ -62,7 +62,7 @@ class DocType:
 		cc = webnotes.model_wrapper(eval(arg))
 		cc.doc.doctype = "Cost Center"
 		cc.doc.old_parent = ""
-		cc.ignore_permission = 1
+		cc.ignore_permissions = 1
 		cc.insert()
 
 		return cc.doc.name

public/js/startup.js

@@ -117,6 +117,7 @@ erpnext.update_messages = function(reset) {
 
 		wn.call({
 			method: 'startup.startup.get_global_status_messages',
+			type:"GET",
 			callback: set_messages
 		});
 	

selling/search_criteria/draft_sales_orders/draft_sales_orders.txt

@@ -1,37 +1,29 @@
 [
  {
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Sales Order Date,Sales Order\x01Customer,Sales Order\x01P.O. No,Sales Order\x01Grand Total',
-		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Draft Sales Orders',
-		'custom_query': '',
-		'description': 'List of Open Sales orders filtered by period, customer and other details',
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
-		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Draft','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-06-01 15:19:41',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'draft_sales_orders',
-		'owner': 'Administrator',
-		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '`tabSales Order`.`name`',
-		'sort_order': 'DESC',
-		'standard': 'Yes'
+  "creation": "2012-05-14 18:20:52", 
+  "docstatus": 0, 
+  "modified": "2013-01-30 15:19:07", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "columns": "Sales Order\u0001ID,Sales Order\u0001Status,Sales Order\u0001Sales Order Date,Sales Order\u0001Customer,Sales Order\u0001P.O. No,Sales Order\u0001Currency,Sales Order\u0001Grand Total (Export)", 
+  "criteria_name": "Draft Sales Orders", 
+  "custom_query": "", 
+  "description": "List of Open Sales orders filtered by period, customer and other details", 
+  "doc_type": "Sales Order", 
+  "doctype": "Search Criteria", 
+  "filters": "{\"Sales Order\\u0001Saved\":1,\"Sales Order\\u0001Submitted\":1,\"Sales Order\\u0001To Sales Order Date\\u0001upper\":\"2013-01-30\",\"Sales Order\\u0001Company\":\"Alpha\",\"Sales Order\\u0001Fiscal Year\":[\"\"],\"Sales Order\\u0001Status\":[\"Draft\"]}", 
+  "module": "Selling", 
+  "name": "__common__", 
+  "page_len": 50, 
+  "report_script": null, 
+  "sort_by": "`tabSales Order`.`name`", 
+  "sort_order": "DESC", 
+  "standard": "Yes"
+ }, 
+ {
+  "doctype": "Search Criteria", 
+  "name": "draft_sales_orders"
  }
 ]

startup/event_handlers.py

@@ -25,9 +25,11 @@ def on_login_post_session(login_manager):
 		# create feed
 		from webnotes.utils import nowtime
 		from webnotes.profile import get_user_fullname
+		webnotes.conn.begin()
 		home.make_feed('Login', 'Profile', login_manager.user, login_manager.user,
 			'%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()), 
 			login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
+		webnotes.conn.commit()
 
 
 def comment_added(doc):

website/templates/html/blog_page.html

@@ -46,7 +46,7 @@
 							<input name="comment_by" placeholder="Your Email Id" />
 						</p>
 						<p>
-							<textarea name="comment" placeholder="Comment" />
+							<textarea name="comment" placeholder="Comment" style="width: 300px; height: 120px;"/>
 							</textarea>
 						</p>
 						<p>