nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge] 4.x to 5.0

Browse Source
This commit is contained in:
Nabin Hait
2014-10-06 12:56:51 +05:30
parent 214164cc38 4f614b4030
commit c68646c694
65 changed files with 3986 additions and 3726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/support/doctype/maintenance_visit/maintenance_visit.json
View File

@@ -279,7 +279,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
"modified": "2014-06-23 07:55:49.200714",
"modified": "2014-09-26 11:37:41.026433",
"modified_by": "Administrator",
"module": "Support",
"name": "Maintenance Visit",
@@ -301,7 +301,7 @@
"write": 1
}
],
"search_fields": "status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year",
"search_fields": "status,maintenance_type,customer,customer_name,mntc_date,company,fiscal_year",
"sort_field": "modified",
"sort_order": "DESC"
}

4
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@@ -14,9 +14,9 @@ $.extend(cur_frm.cscript, {
erpnext.toggle_naming_series();
if(!doc.__islocal) {
if(cur_frm.fields_dict.status.get_status()=="Write") {
if(doc.status!='Closed') cur_frm.add_custom_button('Close',
if(doc.status!='Closed') cur_frm.add_custom_button(__('Close'),
cur_frm.cscript['Close Ticket'], "icon-ok", "btn-success");
if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket',
if(doc.status=='Closed') cur_frm.add_custom_button(__('Re-Open Ticket'),
cur_frm.cscript['Re-Open Ticket'], null, "btn-default");
}