[ux] fixes to timeline
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
index 6ba2d44..0351fd1 100644
--- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
@@ -124,12 +124,6 @@
"read_only": 1
},
{
- "fieldname": "column_break99",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0
- },
- {
"fieldname": "difference",
"fieldtype": "Currency",
"label": "Difference (Dr - Cr)",
@@ -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
},
@@ -188,6 +174,31 @@
"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",
"in_filter": 1,
@@ -201,23 +212,6 @@
"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",
"fieldtype": "Small Text",
@@ -231,6 +225,12 @@
"reqd": 0
},
{
+ "fieldname": "column_break98",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0
+ },
+ {
"fieldname": "bill_no",
"fieldtype": "Data",
"in_list_view": 0,
@@ -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 a7827bc..ae6437a 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -715,6 +715,11 @@
"read_only": 0
},
{
+ "fieldname": "fold",
+ "fieldtype": "Fold",
+ "permlevel": 0
+ },
+ {
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions",
@@ -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 4562ca8..ac44b4d 100644
--- a/erpnext/home/page/activity/activity.js
+++ b/erpnext/home/page/activity/activity.js
@@ -24,9 +24,9 @@
// 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 @@
} 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 85bd3a2..30390b0 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"
}
]