From 0d0f5f6c25a9e76e23a333d96ec45e7171687240 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 14 Aug 2014 11:43:27 +0530
Subject: [PATCH] [ux] fixes to timeline

---
 .../journal_voucher/journal_voucher.json      | 68 +++++++++----------
 .../doctype/sales_invoice/sales_invoice.json  |  7 +-
 erpnext/home/page/activity/activity.js        |  6 +-
 .../doctype/support_ticket/test_records.json  |  4 +-
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
index 6ba2d44c3c..0351fd1da8 100644
--- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
@@ -123,12 +123,6 @@
    "permlevel": 0, 
    "read_only": 1
   }, 
-  {
-   "fieldname": "column_break99", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
   {
    "fieldname": "difference", 
    "fieldtype": "Currency", 
@@ -150,16 +144,8 @@
    "read_only": 0
   }, 
   {
-   "fieldname": "view_details", 
-   "fieldtype": "Fold", 
-   "label": "View Details", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "reference", 
-   "fieldtype": "Section Break", 
-   "label": "Reference", 
-   "options": "icon-pushpin", 
+   "fieldname": "column_break99", 
+   "fieldtype": "Column Break", 
    "permlevel": 0, 
    "read_only": 0
   }, 
@@ -187,6 +173,31 @@
    "permlevel": 0, 
    "read_only": 0
   }, 
+  {
+   "fieldname": "user_remark", 
+   "fieldtype": "Small Text", 
+   "in_filter": 1, 
+   "label": "User Remark", 
+   "no_copy": 1, 
+   "oldfieldname": "user_remark", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "view_details", 
+   "fieldtype": "Fold", 
+   "label": "View Details", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "reference", 
+   "fieldtype": "Section Break", 
+   "label": "Reference", 
+   "options": "icon-pushpin", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
   {
    "fieldname": "clearance_date", 
    "fieldtype": "Date", 
@@ -200,23 +211,6 @@
    "read_only": 1, 
    "search_index": 1
   }, 
-  {
-   "fieldname": "column_break98", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
-   "fieldname": "user_remark", 
-   "fieldtype": "Small Text", 
-   "in_filter": 1, 
-   "label": "User Remark", 
-   "no_copy": 1, 
-   "oldfieldname": "user_remark", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
   {
    "description": "User Remark will be added to Auto Remark", 
    "fieldname": "remark", 
@@ -230,6 +224,12 @@
    "read_only": 1, 
    "reqd": 0
   }, 
+  {
+   "fieldname": "column_break98", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
   {
    "fieldname": "bill_no", 
    "fieldtype": "Data", 
@@ -446,7 +446,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-08-11 07:29:48.343753", 
+ "modified": "2014-08-14 01:37:14.822939", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Voucher", 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index a7827bc73f..ae6437a8ac 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -714,6 +714,11 @@
    "print_hide": 1, 
    "read_only": 0
   }, 
+  {
+   "fieldname": "fold", 
+   "fieldtype": "Fold", 
+   "permlevel": 0
+  }, 
   {
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
@@ -1188,7 +1193,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-07-31 06:34:41.295337", 
+ "modified": "2014-08-14 02:13:09.673510", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js
index 4562ca8e39..ac44b4d776 100644
--- a/erpnext/home/page/activity/activity.js
+++ b/erpnext/home/page/activity/activity.js
@@ -24,9 +24,9 @@ frappe.pages['activity'].onload = function(wrapper) {
 
 	// Build Report Button
 	if(frappe.boot.user.can_get_report.indexOf("Feed")!=-1) {
-		wrapper.appframe.add_primary_action(__('Build Report'), function() {
+		wrapper.appframe.add_button(__('Build Report'), function() {
 			frappe.set_route('Report', "Feed");
-		}, 'icon-th', true);
+		}, 'icon-th');
 	}
 }
 
@@ -81,7 +81,7 @@ erpnext.ActivityFeed = Class.extend({
 			} else {
 				pdate = dateutil.global_date_format(date);
 			}
-			$(row).html(repl('<div class="date-sep">%(date)s</div>', {date: pdate}));
+			$(row).html(repl('<div class="date-sep" style="padding-left: 15px;">%(date)s</div>', {date: pdate}));
 		}
 		erpnext.last_feed_date = date;
 	}
diff --git a/erpnext/support/doctype/support_ticket/test_records.json b/erpnext/support/doctype/support_ticket/test_records.json
index 85bd3a2410..30390b06d1 100644
--- a/erpnext/support/doctype/support_ticket/test_records.json
+++ b/erpnext/support/doctype/support_ticket/test_records.json
@@ -1,6 +1,8 @@
 [
 	{
 		"doctype": "Support Ticket",
-		"name": "_Test Support Ticket 1"
+		"name": "_Test Support Ticket 1",
+		"subject": "Test Support",
+		"raised_by": "test@example.com"
 	}
 ]