Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/selling/doctype/installation_note/installation_note.py b/selling/doctype/installation_note/installation_note.py
index ed49aef..63e1bae 100644
--- a/selling/doctype/installation_note/installation_note.py
+++ b/selling/doctype/installation_note/installation_note.py
@@ -52,7 +52,6 @@
sales_com_obj = get_obj(dt = 'Sales Common')
sales_com_obj.check_active_sales_items(self)
sales_com_obj.get_prevdoc_date(self)
- self.validate_mandatory()
self.validate_reference_value()
def pull_delivery_note_details(self):
diff --git a/selling/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py
index efc5412..c474d99 100644
--- a/selling/doctype/quotation/quotation.py
+++ b/selling/doctype/quotation/quotation.py
@@ -158,7 +158,6 @@
"Order Confirmed", "Order Lost", "Cancelled"])
self.validate_fiscal_year()
- self.validate_mandatory()
self.set_last_contact_date()
self.validate_order_type()
self.validate_for_items()
diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py
index d9b1bd2..fd74976 100644
--- a/stock/doctype/delivery_note/delivery_note.py
+++ b/stock/doctype/delivery_note/delivery_note.py
@@ -124,7 +124,6 @@
sales_com_obj.check_stop_sales_order(self)
sales_com_obj.check_active_sales_items(self)
sales_com_obj.get_prevdoc_date(self)
- self.validate_mandatory()
self.validate_reference_value()
self.validate_for_items()
self.validate_warehouse()
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index 4226b47..4ea179d 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -27,8 +27,8 @@
refresh: function(doc) {
erpnext.hide_naming_series();
cur_frm.cscript.make_listing(doc);
- if(!doc.__islocal) {
- if(user_roles.indexOf("Support Manager")!==-1) {
+ if(!doc.__islocal) {
+ if(cur_frm.fields_dict.status.get_status()=="Write") {
if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']);
if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']);
}