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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait 2013-07-10 14:17:19 +05:30
commit a0af48f101
3 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
support/doctype/customer_issue/customer_issue.js
View File

@ -18,10 +18,9 @@ wn.provide("erpnext.support");
// TODO commonify this code // TODO commonify this code
erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({ erpnext.support.CustomerIssue = wn.ui.form.Controller.extend({
refresh: function() { refresh: function() {
if(cur_frm.doc.docstatus==1 && (cur_frm.doc.status=='Open' || if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
cur_frm.doc.status == 'Work In Progress')) { cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit)
cur_frm.add_custom_button('Make Maintenance Visit', this.make_maintenance_visit) }
}
}, },
customer: function() { customer: function() {

32
support/doctype/customer_issue/customer_issue.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:30", "creation": "2013-01-10 16:34:30",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-05 14:34:37", "modified": "2013-07-10 13:13:27",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "harshada@webnotestech.com" "owner": "harshada@webnotestech.com"
}, },
@ -10,7 +10,7 @@
"autoname": "naming_series:", "autoname": "naming_series:",
"doctype": "DocType", "doctype": "DocType",
"icon": "icon-bug", "icon": "icon-bug",
"is_submittable": 1, "is_submittable": 0,
"module": "Support", "module": "Support",
"name": "__common__", "name": "__common__",
"search_fields": "status,customer,customer_name,allocated_to,allocated_on, territory" "search_fields": "status,customer,customer_name,allocated_to,allocated_on, territory"
@ -24,6 +24,8 @@
"permlevel": 0 "permlevel": 0
}, },
{ {
"amend": 0,
"cancel": 1,
"create": 1, "create": 1,
"doctype": "DocPerm", "doctype": "DocPerm",
"name": "__common__", "name": "__common__",
@ -33,6 +35,8 @@
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Maintenance User",
"submit": 0,
"write": 1 "write": 1
}, },
{ {
@ -412,28 +416,6 @@
"width": "150px" "width": "150px"
}, },
{ {
"amend": 1, "doctype": "DocPerm"
"cancel": 1,
"doctype": "DocPerm",
"role": "System Manager",
"submit": 1
},
{
"amend": 1,
"cancel": 1,
"doctype": "DocPerm",
"role": "Maintenance Manager",
"submit": 1
},
{
"amend": 1,
"cancel": 1,
"doctype": "DocPerm",
"role": "Maintenance User",
"submit": 1
},
{
"doctype": "DocPerm",
"role": "Guest"
} }
] ]

1
support/doctype/maintenance_visit/maintenance_visit.js
View File

@ -37,7 +37,6 @@ erpnext.support.MaintenanceVisit = wn.ui.form.Controller.extend({
method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit", method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
source_doctype: "Customer Issue", source_doctype: "Customer Issue",
get_query_filters: { get_query_filters: {
docstatus: 1,
status: ["in", "Open, Work in Progress"], status: ["in", "Open, Work in Progress"],
customer: cur_frm.doc.customer || undefined, customer: cur_frm.doc.customer || undefined,
company: cur_frm.doc.company company: cur_frm.doc.company