Shiloh/brotherton-erpnext
1
0
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:
Rushabh Mehta 2013-06-11 17:33:11 +05:30
commit 1e9c827ea3
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selling/doctype/installation_note/installation_note.py
View File

@ -52,7 +52,6 @@ class DocType(TransactionBase):
sales_com_obj = get_obj(dt = 'Sales Common') sales_com_obj = get_obj(dt = 'Sales Common')
sales_com_obj.check_active_sales_items(self) sales_com_obj.check_active_sales_items(self)
sales_com_obj.get_prevdoc_date(self) sales_com_obj.get_prevdoc_date(self)
self.validate_mandatory()
self.validate_reference_value() self.validate_reference_value()
def pull_delivery_note_details(self): def pull_delivery_note_details(self):

1
selling/doctype/quotation/quotation.py
View File

@ -158,7 +158,6 @@ class DocType(SellingController):
"Order Confirmed", "Order Lost", "Cancelled"]) "Order Confirmed", "Order Lost", "Cancelled"])
self.validate_fiscal_year() self.validate_fiscal_year()
self.validate_mandatory()
self.set_last_contact_date() self.set_last_contact_date()
self.validate_order_type() self.validate_order_type()
self.validate_for_items() self.validate_for_items()

1
stock/doctype/delivery_note/delivery_note.py
View File

@ -124,7 +124,6 @@ class DocType(SellingController):
sales_com_obj.check_stop_sales_order(self) sales_com_obj.check_stop_sales_order(self)
sales_com_obj.check_active_sales_items(self) sales_com_obj.check_active_sales_items(self)
sales_com_obj.get_prevdoc_date(self) sales_com_obj.get_prevdoc_date(self)
self.validate_mandatory()
self.validate_reference_value() self.validate_reference_value()
self.validate_for_items() self.validate_for_items()
self.validate_warehouse() self.validate_warehouse()

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

@ -27,8 +27,8 @@ $.extend(cur_frm.cscript, {
refresh: function(doc) { refresh: function(doc) {
erpnext.hide_naming_series(); erpnext.hide_naming_series();
cur_frm.cscript.make_listing(doc); cur_frm.cscript.make_listing(doc);
if(!doc.__islocal) { if(!doc.__islocal) {
if(user_roles.indexOf("Support Manager")!==-1) { 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('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']); if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']);
} }