Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ux] fixes to timeline

Browse Source
This commit is contained in:
Rushabh Mehta 2014-08-14 11:43:27 +05:30
parent ab8bde0149
commit 0d0f5f6c25
4 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
erpnext/accounts/doctype/journal_voucher/journal_voucher.json
View File

@ -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",

7
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -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",

6
erpnext/home/page/activity/activity.js
View File

@ -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;
}

4
erpnext/support/doctype/support_ticket/test_records.json
View File

@ -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"
}
]