Merge pull request #2050 from anandpdoshi/anand-august-11

Feed, Form Grid

erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

@@ -351,6 +351,7 @@
    "permlevel": 0
   }, 
   {
+   "allow_on_submit": 1, 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
    "label": "Available Qty at Warehouse", 
@@ -448,7 +449,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-08-01 06:14:28.707601", 
+ "modified": "2014-08-11 03:52:58.926627", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 

erpnext/home/__init__.py

@@ -93,6 +93,10 @@ def update_feed(doc, method=None):
 
 def make_comment_feed(doc, method):
 	"""add comment to feed"""
-	make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
+	comment = doc.comment
-		'<i>"' + doc.comment + '"</i>', '#6B24B3')
+	if len(comment) > 240:
+		comment = comment[:240] + "..."
+
+	make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
+		'<i>"' + comment + '"</i>', '#6B24B3')
 

erpnext/selling/doctype/sales_order_item/sales_order_item.json

@@ -101,7 +101,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float",
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount(%)", 
    "oldfieldname": "adj_rate", 
@@ -328,6 +328,7 @@
    "width": "70px"
   }, 
   {
+   "allow_on_submit": 1, 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
    "in_list_view": 0, 
@@ -432,7 +433,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-07-31 04:55:10.143164",
+ "modified": "2014-08-11 03:57:27.705699", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 

erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

@@ -322,6 +322,7 @@
    "permlevel": 0
   }, 
   {
+   "allow_on_submit": 1, 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
    "label": "Available Qty at Warehouse", 
@@ -431,7 +432,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-07-29 06:11:36.636120", 
+ "modified": "2014-08-11 03:54:26.513630", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 

erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json

@@ -233,8 +233,10 @@
    "permlevel": 0
   }, 
   {
+   "allow_on_submit": 1, 
    "fieldname": "actual_qty", 
    "fieldtype": "Float", 
+   "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "label": "Actual Qty (at source/target)", 
    "no_copy": 1, 
@@ -300,7 +302,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-07-29 05:28:21.872968", 
+ "modified": "2014-08-11 03:54:49.688635", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry Detail", 

erpnext/templates/form_grid/includes/visible_cols.html

@@ -2,10 +2,10 @@
 	{% 	var val = doc.get_formatted(df.fieldname);
 	if(val) { %}
 		<div class="row">
-			<div class="col-xs-3">
+			<div class="col-xs-4 text-ellipsis">
-				<strong>{%= __(df.label) %}:</strong>
+				<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>
 			</div>
-			<div class="col-xs-9">
+			<div class="col-xs-8">
 				{%= doc.get_formatted(df.fieldname) %}
 			</div>
 		</div>